include/dap_hash.h

@@ -45,6 +45,10 @@ typedef union dap_chain_hash_fast{
     uint8_t raw[DAP_CHAIN_HASH_FAST_SIZE];
 } dap_chain_hash_fast_t;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //size_t dap_chain_hash_fast_to_str(dap_chain_hash_fast_t * a_hash, char * a_str, size_t a_str_max);
 int dap_chain_str_to_hash_fast( const char * a_hash_str, dap_chain_hash_fast_t * a_hash);
 
@@ -92,6 +96,7 @@ static inline bool dap_hash_fast_is_blank( dap_chain_hash_fast_t *a_hash )
 
 DAP_STATIC_INLINE int dap_chain_hash_fast_to_str( dap_chain_hash_fast_t *a_hash, char *a_str, size_t a_str_max )
 {
+    (void) a_str_max;
   a_str[0] = '0';
   a_str[1] = 'x';
   a_str[ DAP_CHAIN_HASH_FAST_SIZE * 2 + 2 ] = 0;
@@ -106,3 +111,7 @@ static inline char *dap_chain_hash_fast_to_str_new(dap_chain_hash_fast_t * a_has
     dap_chain_hash_fast_to_str( a_hash, ret, c_hash_str_size );
     return ret;
 }
+
+#ifdef __cplusplus
+}
+#endif

src/XKCP/lib/high/Keccak/SP800-185/SP800-185.inc

@@ -160,7 +160,7 @@ int KMAC_Initialize(KMAC_Instance *km, const BitSequence *key, BitLength keyBitL
     BitLength   keyByteLen;
     BitSequence buffer[rateInBytes];
 
-    if (cSHAKE_Initialize(&km->csi, outputBitLen, "KMAC", 4*8, customization, customBitLen) != 0)
+    if (cSHAKE_Initialize(&km->csi, outputBitLen, (const BitSequence*) "KMAC", 4*8, customization, customBitLen) != 0)
         return 1;
     km->outputBitLen = outputBitLen;
 
@@ -309,7 +309,7 @@ int ParallelHash_Initialize(ParallelHash_Instance *phi, unsigned int blockByteLe
         return 1;
 
     /* Absorb string_encode("ParallelHash") */
-    if (KeccakWidth1600_SpongeAbsorb(&phi->finalNode, "\x01\x60" "ParallelHash", 14) != 0)
+    if (KeccakWidth1600_SpongeAbsorb(&phi->finalNode,(const BitSequence*)  "\x01\x60" "ParallelHash", 14) != 0)
         return 1;
 
     /* Absorb string_encode(customization) */
@@ -493,7 +493,7 @@ int ParallelHash( const BitSequence *input, BitLength inputBitLen, unsigned int
 int TupleHash_Initialize(TupleHash_Instance *thi, BitLength outputBitLen,
         const BitSequence *customization, BitLength customBitLen)
 {
-    if (cSHAKE_Initialize(&thi->csi, outputBitLen, "TupleHash", 9*8, customization, customBitLen) != 0)
+    if (cSHAKE_Initialize(&thi->csi, outputBitLen,(const BitSequence*) "TupleHash", 9*8, customization, customBitLen) != 0)
         return 1;
     thi->outputBitLen = outputBitLen;
     return 0;

src/dap_cert.c

@@ -269,11 +269,7 @@ dap_cert_t * dap_cert_find_by_name(const char * a_cert_name)
             char *l_cert_path = NULL;
             l_ca_folders = dap_config_get_array_str(g_config, "resources", "ca_folders", &l_ca_folders_size);
             for (uint16_t i = 0; i < l_ca_folders_size; ++i) {
-#ifdef _WIN32
-                l_cert_path = dap_strjoin("", s_sys_dir_path, l_ca_folders[i], "/", a_cert_name, ".dcert", (char*)NULL);
-#else
                 l_cert_path = dap_strjoin("", l_ca_folders[i], "/", a_cert_name, ".dcert", (char*)NULL);
-#endif
                 l_cert = dap_cert_file_load(l_cert_path);
                 if (l_cert) {
                     goto ret;