Merge pull request #3 from cellframe/feature-2319

fixed dap_enc_sig_bliss_key_delete()

.gitmodules

@@ -2,3 +2,6 @@
 	path = test/libdap-test
 	url = https://github.com/kelvinblockchain/libdap-test
 	branch = master
+[submodule "libdap"]
+	path = libdap
+	url = https://github.com/cellframe/libdap

.travis.yml

@@ -12,8 +12,8 @@ before_install:
 script:
     - sudo service network-manager start
     - mkdir build
-    - cd build 
-    - cmake -DBUILD_DAP_TESTS=ON ../
+    - cd build
+    - cmake -DBUILD_CRYPTO_TESTS=ON ../
     - make
     - ctest --verbose
 

CMakeLists.txt

@@ -6,6 +6,10 @@ add_definitions ("-D_GNU_SOURCE")
 
 set(CMAKE_C_FLAGS "-std=c11 -Wall -Wextra")
 
+if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
+    add_subdirectory(libdap)
+endif()
+
 file(GLOB CRYPTO_SRCS src/*.c src/rand/*.c src/iaes/*.c src/oaes/*.c src/sha3/*.c src/msrln/*.c src/defeo_scheme/*.c src/sig_bliss/*.c src/sig_tesla/*.c src/sig_picnic/*.c)
 file(GLOB CRYPTO_HEADERS src/*.h src/rand/*.h src/iaes/*.h src/oaes/*.h src/sha3/*.h src/msrln/*.h src/defeo_scheme/*.h src/sig_bliss/*.h src/sig_tesla/*.h src/sig_picnic/*.c include/*.h)
 
@@ -17,8 +21,7 @@ target_include_directories(dap_crypto INTERFACE src/ src/sha3 include/)
 target_link_libraries(dap_crypto dap_core m)
 
 
-if(BUILD_DAP_TESTS)
+if(BUILD_CRYPTO_TESTS)
     enable_testing()
     add_subdirectory(test)
 endif()
-

libdap @ 78cc4a3a

+Subproject commit 78cc4a3aca1775288662ef7a9f49f7b747479e15

src/dap_enc_base58.c

@@ -58,7 +58,7 @@ size_t dap_enc_base58_decode(const char * a_in, void * a_out)
     size_t l_outi_size = (l_out_size_max + 3) / 4;
 
     uint32_t l_outi[l_outi_size];
-    memzero(l_outi,l_outi_size*sizeof(uint32_t));
+    memset(l_outi, 0, l_outi_size*sizeof(uint32_t));
     uint64_t t;
     uint32_t c;
     size_t i, j;
@@ -163,7 +163,7 @@ size_t dap_enc_base58_encode(const void * a_in, size_t a_in_size, char * a_out)
 
     size = (a_in_size - zcount) * 138 / 100 + 1;
     uint8_t buf[size];
-    memzero(buf, size);
+    memset(buf, 0, size);
 
     for (i = zcount, high = size - 1; i < (ssize_t)a_in_size; ++i, high = j)
     {

src/dap_enc_bliss.c

@@ -139,8 +139,10 @@ int dap_enc_sig_bliss_verify_sign(struct dap_enc_key * key, const void * msg,
 
 void dap_enc_sig_bliss_key_delete(struct dap_enc_key *key)
 {
-    bliss_b_private_key_delete(key->priv_key_data);
-    bliss_b_public_key_delete(key->pub_key_data);
+    if(key->priv_key_data)
+        bliss_b_private_key_delete(key->priv_key_data);
+    if(key->pub_key_data)
+        bliss_b_public_key_delete(key->pub_key_data);
 }
 
 /* Serialize a signature */

test/CMakeLists.txt

@@ -4,5 +4,4 @@ project(test)
 set(CMAKE_C_STANDARD 11)
 
 add_subdirectory(libdap-test)
-add_subdirectory(core)
 add_subdirectory(crypto)

test/crypto/CMakeLists.txt

@@ -6,7 +6,7 @@ file(GLOB SRC *.h *.c)
 
 add_executable(${PROJECT_NAME} ${SRC})
 
-target_link_libraries(${PROJECT_NAME} dap_test dap_crypto -lm)
+target_link_libraries(${PROJECT_NAME} dap_test dap_core dap_crypto -lm)
 
 add_test(
     NAME crypto-test