Merge pull request #140 from skalenetwork/SKALE-3067-cleanip2

Skale 3067 cleanip2
skalenetwork · Aug 13, 2020 · b95ab32 · b95ab32
2 parents 0637814 + b000e64
commit b95ab32
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 1,232 deletions.
diff --git a/BLSPrivateKeyShareSGX.cpp b/BLSPrivateKeyShareSGX.cpp
@@ -151,7 +151,7 @@ std::string BLSPrivateKeyShareSGX::signWithHelperSGXstr(
   cerr << "Key is " + *encryptedKeyHex << endl;
 
   sgx_status_t status =
-      trustedBlsSignMessage(eid, &errStatus, errMsg, encryptedKey,
+      trustedBlsSignMessageAES(eid, &errStatus, errMsg, encryptedKey,
                        encryptedKeyHex->size() / 2, xStrArg, yStrArg, signature);
 
   printf("sig is: %s\n", signature);

diff --git a/Log.h b/Log.h
@@ -79,7 +79,7 @@ class Log {
 
 #define HANDLE_SGX_EXCEPTION(__RESULT__) \
     catch (SGXException& _e) { \
-      __RESULT__["status"] = _e.status; \
+      if (_e.status != 0) {__RESULT__["status"] = _e.status;} else { __RESULT__["status"]  = UNKNOWN_ERROR;}; \
       __RESULT__["errorMessage"] = _e.errString; \
       return __RESULT__; \
       } catch (exception& _e) { \