Merge branch 'develop' into SKALE-3751-enable-zeromq

SGXWalletServer.cpp

@@ -1094,7 +1094,9 @@ shared_ptr <string> SGXWalletServer::readFromDb(const string &name, const string
     auto dataStr = checkDataFromDb(prefix + name);
 
     if (dataStr == nullptr) {
-        throw SGXException(KEY_SHARE_DOES_NOT_EXIST, string(__FUNCTION__) + ":Data with this name does not exist");
+
+        throw SGXException(KEY_SHARE_DOES_NOT_EXIST, string(__FUNCTION__) +  ":Data with this name does not exist: "
+                                                                                                    + prefix + name);
     }
 
     return dataStr;
@@ -1108,7 +1110,8 @@ shared_ptr <string> SGXWalletServer::checkDataFromDb(const string &name, const s
 
 void SGXWalletServer::writeKeyShare(const string &_keyShareName, const string &_value) {
     if (LevelDB::getLevelDb()->readString(_keyShareName) != nullptr) {
-        throw SGXException(KEY_SHARE_ALREADY_EXISTS, string(__FUNCTION__) + ":Key share with this name already exists");
+        throw SGXException(KEY_SHARE_ALREADY_EXISTS, string(__FUNCTION__) + ":Key share with this name already exists"
+                                                                                                        + _keyShareName);
     }
 
     LevelDB::getLevelDb()->writeString(_keyShareName, _value);
@@ -1117,7 +1120,7 @@ void SGXWalletServer::writeKeyShare(const string &_keyShareName, const string &_
 void SGXWalletServer::writeDataToDB(const string &name, const string &value) {
 
     if (LevelDB::getLevelDb()->readString(name) != nullptr) {
-        throw SGXException(KEY_NAME_ALREADY_EXISTS, string(__FUNCTION__) + ":Name already exists");
+        throw SGXException(KEY_NAME_ALREADY_EXISTS, string(__FUNCTION__) + ":Name already exists" + name);
     }
     LevelDB::getLevelDb()->writeString(name, value);
 }

secure_enclave/DHDkg.c

@@ -345,7 +345,13 @@ int hash_key(char* key, char* hashed_key) {
         return ret;
     }
 
-    ret = sgx_sha256_msg((uint8_t*)key, ECDSA_SKEY_LEN - 1, (uint8_t*)hashed_key);
+    uint8_t key_to_hash[33];
+    uint64_t len;
+    if (!hex2carray(key, &len, key_to_hash)) {
+        return ret;
+    }
+
+    ret = sgx_sha256_msg(key_to_hash, ECDSA_BIN_LEN - 1, (uint8_t*)hashed_key);
 
     return ret;
 }

testw.cpp

@@ -784,7 +784,11 @@ TEST_CASE_METHOD(TestFixture, "AES_DKG V2 test", "[aes-dkg-v2]") {
     SAFE_CHAR_BUF(common_key, BUF_LEN);
     REQUIRE(sessionKeyRecoverDH(dhKey.c_str(), encr_sshare, common_key) == 0);
 
-    auto hashed_key = cryptlite::sha256::hash_hex(string(common_key, 64));
+    uint8_t key_to_hash[33];
+    uint64_t len;
+    REQUIRE( hex2carray(common_key, &len, key_to_hash, 64) );
+
+    auto hashed_key = cryptlite::sha256::hash_hex(string((char*)key_to_hash, 32));
 
     SAFE_CHAR_BUF(derived_key, 33)