dap_chain_cert.c

@@ -104,13 +104,11 @@ size_t dap_chain_cert_parse_str_list(const char * a_certs_str, dap_chain_cert_t
     size_t l_certs_pos = 0;
     size_t l_sign_total_size =0;
     while(l_cert_str) {
-
-        // trim token whitespace
-        if(isspace(l_cert_str[0]))
-            l_cert_str = l_cert_str + 1;
-        if(isspace(l_cert_str[strlen(l_cert_str) - 1]))
-            l_cert_str[strlen(l_cert_str) - 1] = 0;
+        // trim whitespace in certificate's name
+        l_cert_str = dap_strstrip(l_cert_str);// removes leading and trailing spaces
+        // get certificate by name
         l_certs[l_certs_pos] = dap_chain_cert_find_by_name(l_cert_str);
+        // if certificate is found
         if(l_certs[l_certs_pos]) {
             l_sign_total_size += dap_chain_cert_sign_output_size(l_certs[l_certs_pos],0);
             l_certs_pos++;
@@ -354,6 +352,7 @@ dap_chain_cert_t * dap_chain_cert_add_file(const char * a_cert_name,const char *
     dap_snprintf(l_cert_path,l_cert_path_length,"%s/%s.dcert",a_folder_path,a_cert_name);
     if( access( l_cert_path, F_OK ) == -1 ) {
         log_it (L_ERROR, "File %s is not exists! ", l_cert_path);
+        DAP_DELETE(l_cert_path);
         exit(-701);
     }
     dap_chain_cert_t * l_cert;
@@ -361,6 +360,7 @@ dap_chain_cert_t * dap_chain_cert_add_file(const char * a_cert_name,const char *
     if (l_cert == NULL){
         log_it (L_ERROR, "File %s is corrupted or wrong format ", l_cert_path);
     }
+    DAP_DELETE(l_cert_path);
     return l_cert;
 }
 
@@ -402,11 +402,18 @@ dap_chain_pkey_t * dap_chain_cert_to_pkey(dap_chain_cert_t * a_cert)
  */
 int dap_chain_cert_compare_with_sign (dap_chain_cert_t * a_cert,dap_chain_sign_t * a_sign)
 {
+    dap_return_val_if_fail(a_cert && a_cert->enc_key && a_sign, -1);
     if ( dap_chain_sign_type_from_key_type( a_cert->enc_key->type ).type == a_sign->header.type.type ){
-        if ( a_cert->enc_key->pub_key_data_size == (size_t) a_sign->header.sign_pkey_size ){
-            return memcmp ( a_cert->enc_key->pub_key_data, a_sign->pkey_n_sign,  a_sign->header.sign_pkey_size );
+        int l_ret;
+        size_t l_pub_key_size = 0;
+        // serialize public key
+        uint8_t *l_pub_key = dap_enc_key_serealize_pub_key(a_cert->enc_key, &l_pub_key_size);
+        if ( l_pub_key_size == a_sign->header.sign_pkey_size){
+            l_ret = memcmp ( l_pub_key, a_sign->pkey_n_sign, a_sign->header.sign_pkey_size );
         }else
-            return -2; // Wrong pkey size
+            l_ret = -2; // Wrong pkey size
+        DAP_DELETE(l_pub_key);
+        return l_ret;
     }else
         return -1; // Wrong sign type
 }
@@ -465,6 +472,7 @@ void dap_chain_cert_add_folder(const char *a_folder_path)
                     // Load the cert file
                     //log_it(L_DEBUG,"Trying to load %s",l_filename);
                     dap_chain_cert_add_file(l_cert_name,a_folder_path);
+                    DAP_DELETE(l_cert_name);
                 }
             }
 

dap_chain_sign.c

@@ -91,10 +91,10 @@ dap_enc_key_type_t  dap_chain_sign_type_to_key_type(dap_chain_sign_type_t  a_cha
 const char * dap_chain_sign_type_to_str(dap_chain_sign_type_t a_chain_sign_type)
 {
     switch (a_chain_sign_type.type) {
-        case DAP_ENC_KEY_TYPE_SIG_BLISS: return "sig_bliss";
-        case DAP_ENC_KEY_TYPE_SIG_TESLA: return "sig_tesla";
-        case DAP_ENC_KEY_TYPE_SIG_PICNIC: return "sig_picnic";
-        default: return DAP_ENC_KEY_TYPE_NULL;
+        case SIG_TYPE_BLISS: return "sig_bliss";
+        case SIG_TYPE_TESLA: return "sig_tesla";
+        case SIG_TYPE_PICNIC: return "sig_picnic";
+        default: return SIG_TYPE_NULL;//DAP_ENC_KEY_TYPE_NULL;
     }
 
 }

libdap @ 85933c82

-Subproject commit 67993d1f4cec44de464acee32a4d4f71d51c7e7d
+Subproject commit 85933c820be2c81416848447b82bb8af15a34a5c

libdap-chain @ 1d4a2b52

-Subproject commit b94cdd0d9ea3e10b5ade8a5f8073d34521a2783a
+Subproject commit 1d4a2b526f78ad87bb83d8c4f7004f0e73c76a59

libdap-chain-global-db @ e3b156b3

-Subproject commit 94d4a28dd97cc1395295e1582839b58ba36e2463
+Subproject commit e3b156b3b8b479bb132e4fbaa5a280369b1b55fd

libdap-chain-net @ fc69de9b

-Subproject commit 5af381b67ea3e6fcaa76a3620cdc11541a2212bf
+Subproject commit fc69de9b70c0752af1226c9ae60acd7b12612a50

libdap-chain-wallet @ 5ed6637b

-Subproject commit 892160fc248cccd1d3749fc70766a07128f450ac
+Subproject commit 5ed6637ba103c45ca05e2dfcc3c187e8f5f23364

libdap-crypto @ 1acfbdd8

-Subproject commit 6249887fdd5c9ed88eb26c1e10f853ea9f7001b6
+Subproject commit 1acfbdd8f5f3caef4c2e584ae2c20ab584b22b4e

libdap-server-core @ de9b4c77

-Subproject commit 6778521f9f646e2985994e63f470067b3e2c1e48
+Subproject commit de9b4c77a021af36148515e3dbc56403ab45490f

libdap-stream @ 27264141

-Subproject commit 0dcee9fe68ab7daaf42ed76d7bce0a1a5dc51631
+Subproject commit 272641415dcf95bbfc0d25bfd9e30a87f78e70ff

libdap-stream-ch @ f2eabb78

-Subproject commit 9bead7765fba0a633098bf2279547c4dbf62cc4f
+Subproject commit f2eabb784a6286356359e69cb50a2957a57aa0b0