SKALE-2167 Memory warnings

BLSCrypto.cpp

@@ -314,22 +314,21 @@ bool bls_sign(const char* _encryptedKeyHex, const char* _hashHex, size_t _t, siz
   }
 }
 
-char *encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key) {
-    char *keyArray = (char *) calloc(BUF_LEN, 1);
-    uint8_t *encryptedKey = (uint8_t *) calloc(BUF_LEN, 1);
-    char *errMsg = (char *) calloc(BUF_LEN, 1);
-    strncpy((char *) keyArray, (char *) _key, BUF_LEN);
-
+char* encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key) {
+    auto keyArray = make_shared<vector<char>>(BUF_LEN, 0);
+    auto encryptedKey = make_shared<vector<uint8_t>>(BUF_LEN, 0);
+    auto errMsg = make_shared<vector<char>>(BUF_LEN, 0);
+    strncpy(keyArray->data(), _key, BUF_LEN);
     *errStatus = -1;
 
     unsigned int encryptedLen = 0;
 
     //status = encrypt_key(eid, errStatus, errMsg, keyArray, encryptedKey, &encryptedLen);
-    status = encrypt_key_aes(eid, errStatus, errMsg, keyArray, encryptedKey, &encryptedLen);
+    status = encrypt_key_aes(eid, errStatus, errMsg->data(), keyArray->data(), encryptedKey->data(), &encryptedLen);
 
     if (DEBUG_PRINT) {
       spdlog::info("errStatus is {}",*errStatus);
-      spdlog::info(" errMsg is ", errMsg );
+      spdlog::info(" errMsg is ", errMsg->data() );
     }
 
     if (status != SGX_SUCCESS) {
@@ -339,13 +338,13 @@ char *encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key)
     }
 
     if (*errStatus != 0) {
-        throw RPCException(-666, errMsg);
+        throw RPCException(-666, errMsg->data());
     }
 
 
     char *result = (char *) calloc(2 * BUF_LEN, 1);
 
-    carray2Hex(encryptedKey, encryptedLen, result);
+    carray2Hex(encryptedKey->data(), encryptedLen, result);
 
     return result;
 }

BLSCrypto.h

@@ -49,8 +49,8 @@ EXTERNC bool hex2carray2(const char * _hex, uint64_t  *_bin_len,
 
 
 
-EXTERNC  char *encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key);
+char * encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key);
 
-EXTERNC char *decryptBLSKeyShareFromHex(int *errStatus, char *errMsg, const char *_encryptedKey);
+char *decryptBLSKeyShareFromHex(int *errStatus, char *errMsg, const char *_encryptedKey);
 
 #endif //SGXWALLET_BLSCRYPTO_H

SGXWalletServer.cpp

@@ -152,11 +152,13 @@ importBLSKeyShareImpl(const string &_keyShare, const string &_keyShareName, int
     result["errorMessage"] = "";
     result["encryptedKeyShare"] = "";
 
+    char *encryptedKeyShareHex = nullptr;
+
     try {
 //        if ( !checkName(_keyShare, "BLS_KEY")){
 //          throw RPCException(INVALID_POLY_NAME, "Invalid BLSKey name");
 //        }
-        char *encryptedKeyShareHex = encryptBLSKeyShare2Hex(&errStatus, errMsg, _keyShare.c_str());
+        encryptedKeyShareHex = encryptBLSKeyShare2Hex(&errStatus, errMsg, _keyShare.c_str());
 
         if (encryptedKeyShareHex == nullptr) {
             throw RPCException(UNKNOWN_ERROR, "");
@@ -166,7 +168,7 @@ importBLSKeyShareImpl(const string &_keyShare, const string &_keyShareName, int
             throw RPCException(errStatus, errMsg);
         }
 
-        result["encryptedKeyShare"] = encryptedKeyShareHex;
+        result["encryptedKeyShare"] = string(encryptedKeyShareHex);
 
         writeKeyShare(_keyShareName, encryptedKeyShareHex, index, n , t);
 
@@ -175,6 +177,10 @@ importBLSKeyShareImpl(const string &_keyShare, const string &_keyShareName, int
         result["errorMessage"] = _e.errString;
     }
 
+    if (encryptedKeyShareHex != nullptr) {
+        free(encryptedKeyShareHex);
+    }
+
     return result;
 }