Merge branch 'bug-5304' into 'release-3.0'

bug-5304

See merge request !414

dap-sdk/crypto/test/crypto/dap_enc_base58_test.c

@@ -7,9 +7,12 @@
 #include "dap_enc_base58.h"
 #include "dap_enc_base58_test.h"
 
+size_t source_size;
+
 static void test_encode_decode_base58(void)
 {
-    static size_t source_size = 0;
+//    static size_t source_size = 0;
+//    source_size = 0;
     int step = 1 + random_uint32_t( 20);
     source_size += (size_t) step;
 
@@ -30,7 +33,7 @@ static void test_encode_decode_base58(void)
 
 void dap_enc_base58_tests_run() {
     dap_print_module_name("dap_enc_base58");
-
+    source_size = 0;
     benchmark_mgs_time("Encode and decode DAP_ENC_STANDARD_B58 100 times",
             benchmark_test_time(test_encode_decode_base58, 100));
 

dap-sdk/crypto/test/crypto/main.c

@@ -15,46 +15,40 @@
 void dap_enc_newhope_tests_run(const int times);
 
 
-int main(void)
-{
- // switch off debug info from library
+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;
+    const int test_numbers = 100;
     dap_enc_newhope_tests_run(test_numbers);
-    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);
-    test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_KUZN_OFB,  32);
-    test_encypt_decrypt      (test_numbers, DAP_ENC_KEY_TYPE_BF_CBC,     0);
-    test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_BF_CBC,     0);
-    test_encypt_decrypt      (test_numbers, DAP_ENC_KEY_TYPE_BF_OFB,     0);
-    test_encypt_decrypt_fast (test_numbers, DAP_ENC_KEY_TYPE_BF_OFB,     0);
-    test_encypt_decrypt      (test_numbers, DAP_ENC_KEY_TYPE_IAES,      32);
-    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);
-   // return 0;
-//    dap_enc_tests_run();
-
-
-//    dap_enc_picnic_tests_run();
-//    dap_enc_sig_bliss_tests_run();
-//    dap_enc_dilithium_tests_run();
-//    dap_enc_msrln_tests_run();
-//
-//    dap_enc_base64_tests_run();
-//    dap_enc_base58_tests_run();
-//    dap_enc_defeo_tests_run();
-//    dap_enc_tesla_tests_run();
-//
-//    dap_enc_multi_sign_tests_run();
+    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);
+    test_encypt_decrypt_fast(test_numbers, DAP_ENC_KEY_TYPE_KUZN_OFB, 32);
+    test_encypt_decrypt(test_numbers, DAP_ENC_KEY_TYPE_BF_CBC, 0);
+    test_encypt_decrypt_fast(test_numbers, DAP_ENC_KEY_TYPE_BF_CBC, 0);
+    test_encypt_decrypt(test_numbers, DAP_ENC_KEY_TYPE_BF_OFB, 0);
+    test_encypt_decrypt_fast(test_numbers, DAP_ENC_KEY_TYPE_BF_OFB, 0);
+    test_encypt_decrypt(test_numbers, DAP_ENC_KEY_TYPE_IAES, 32);
+    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);
+//    // return 0;
+    dap_enc_tests_run();
+    dap_enc_picnic_tests_run();
+    dap_enc_sig_bliss_tests_run();
+    dap_enc_dilithium_tests_run();
+    dap_enc_msrln_tests_run();
+    dap_enc_base64_tests_run();
+    dap_enc_base58_tests_run();
+
+    dap_enc_defeo_tests_run();
+    dap_enc_tesla_tests_run();
+
+    dap_enc_multi_sign_tests_run();
 
     dap_enc_ringct20_tests_run(100);
-
-
 }