diff --git a/dap-sdk/crypto/src/salsa2012/crypto_stream_salsa2012.h b/dap-sdk/crypto/src/salsa2012/crypto_stream_salsa2012.h
index d6cc6e2349ce84c804bbfd68beae4f99d1597206..9722d8d1fa0604a6be59e3735dd476290e67fcec 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 d7ce0289c130319c4bb870efa666bd6e0bcaf2be..0000000000000000000000000000000000000000
--- 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 ad3fb8c32e9cebef46abb2b67766c0fd537fa16f..2da1f2746a039cdb64bd813e9e3be0b248ee2c1f 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 e1073d68602601603c7c5642bea5ce86e1f94b68..019cb3778727913d65d74f02394d8316936d794a 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();