From c15df4b512e27bd75a09c749c65483953ecea993 Mon Sep 17 00:00:00 2001
From: "ivan.fedorov" <ivan.fedorov@demlabs.net>
Date: Tue, 19 May 2020 00:05:26 +0300
Subject: [PATCH] def SIZE_MAX
---
.../crypto/src/salsa2012/crypto_stream_salsa2012.h | 13 +++++++++++--
dap-sdk/crypto/src/salsa2012/utils.h | 9 ---------
dap-sdk/crypto/test/crypto/dap_enc_test.c | 2 +-
dap-sdk/crypto/test/crypto/main.c | 6 +++---
4 files changed, 15 insertions(+), 15 deletions(-)
delete mode 100644 dap-sdk/crypto/src/salsa2012/utils.h
diff --git a/dap-sdk/crypto/src/salsa2012/crypto_stream_salsa2012.h b/dap-sdk/crypto/src/salsa2012/crypto_stream_salsa2012.h
index d6cc6e2349..9722d8d1fa 100644
--- a/dap-sdk/crypto/src/salsa2012/crypto_stream_salsa2012.h
+++ b/dap-sdk/crypto/src/salsa2012/crypto_stream_salsa2012.h
@@ -1,6 +1,6 @@
#ifndef crypto_stream_salsa2012_H
#define crypto_stream_salsa2012_H
-
+#define __STDC_LIMIT_MACROS
/*
* WARNING: This is just a stream cipher. It is NOT authenticated encryption.
* While it provides some protection against eavesdropping, it does NOT
@@ -10,12 +10,21 @@
*/
#include <stddef.h>
-#include "utils.h"
+#include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
+
+
+#define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
+#if defined(UINT64_MAX) && defined(SIZE_MAX)
+ #define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+#else
+ #define SODIUM_SIZE_MAX ((1 << 30) - 1)
+#endif
+
#define crypto_stream_salsa2012_KEYBYTES 32U
size_t crypto_stream_salsa2012_keybytes(void);
diff --git a/dap-sdk/crypto/src/salsa2012/utils.h b/dap-sdk/crypto/src/salsa2012/utils.h
deleted file mode 100644
index d7ce0289c1..0000000000
--- a/dap-sdk/crypto/src/salsa2012/utils.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef sodium_utils_H
-#define sodium_utils_H
-
-#include <stddef.h>
-
-
-#define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
-#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
-#endif
diff --git a/dap-sdk/crypto/test/crypto/dap_enc_test.c b/dap-sdk/crypto/test/crypto/dap_enc_test.c
index ad3fb8c32e..2da1f2746a 100755
--- a/dap-sdk/crypto/test/crypto/dap_enc_test.c
+++ b/dap-sdk/crypto/test/crypto/dap_enc_test.c
@@ -32,7 +32,7 @@ void test_encypt_decrypt(int count_steps, const dap_enc_key_type_t key_type, con
randombytes(kex, kex_size);
dap_enc_key_t* key = dap_enc_key_new_generate(key_type, kex, kex_size, seed, seed_size, cipher_key_size);
- source_size = 1 + random_uint32_t(max_source_size);
+ source_size = 256;//1 + random_uint32_t(max_source_size);
uint8_t *source = DAP_NEW_SIZE(uint8_t, source_size);
diff --git a/dap-sdk/crypto/test/crypto/main.c b/dap-sdk/crypto/test/crypto/main.c
index e1073d6860..019cb37787 100755
--- a/dap-sdk/crypto/test/crypto/main.c
+++ b/dap-sdk/crypto/test/crypto/main.c
@@ -20,12 +20,13 @@ int main(void)
// switch off debug info from library
dap_log_level_set(L_CRITICAL);
const int test_numbers = 100;
+ dap_enc_ringct20_tests_run(test_numbers);//return 0;
dap_enc_multi_sign_tests_run();
dap_enc_newhope_tests_run(test_numbers);
- test_encypt_decrypt (test_numbers, DAP_ENC_KEY_TYPE_SEED_OFB, 32);
- test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_SEED_OFB, 32);
test_encypt_decrypt (test_numbers, DAP_ENC_KEY_TYPE_SALSA2012, 32);
test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_SALSA2012, 32);
+ test_encypt_decrypt (test_numbers, DAP_ENC_KEY_TYPE_SEED_OFB, 32);
+ test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_SEED_OFB, 32);
test_encypt_decrypt (test_numbers, DAP_ENC_KEY_TYPE_GOST_OFB, 32);
test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_GOST_OFB, 32);
test_encypt_decrypt (test_numbers, DAP_ENC_KEY_TYPE_KUZN_OFB, 32);
@@ -38,7 +39,6 @@ int main(void)
test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_IAES, 32);
test_encypt_decrypt (test_numbers, DAP_ENC_KEY_TYPE_OAES, 32);
test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_OAES, 32);
- dap_enc_ringct20_tests_run(test_numbers);
// return 0;
dap_enc_tests_run();
--
GitLab