SKALE-3039

BLSCrypto.cpp

@@ -261,7 +261,7 @@ string encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key
     RESTART_BEGIN
         status = trustedEncryptKeyAES(eid, errStatus, errMsg.data(), keyArray->data(), encryptedKey->data(),
                                       &encryptedLen);
-    RESTART_END
+    RESTART_END_POINTER
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, *errStatus, errMsg.data());
 

sgxwallet_common.h

@@ -119,12 +119,23 @@ READ_LOCK(initMutex);
 
 #define RESTART_END \
 } \
-if (status != SGX_SUCCESS) { \
-spdlog::error(__FUNCTION__); \
-spdlog::error("Restarting sgx ..."); \
+if (status != SGX_SUCCESS || errStatus != 0) { \
+spdlog::error(__FUNCTION__);                   \
+spdlog::error("Restarting sgx on status errStatus... {} {}", status, errStatus);                    \
 reinitEnclave(); \
 } \
-} while (status != SGX_SUCCESS && __ATTEMPTS__ < 2);
+} while ((status != SGX_SUCCESS || errStatus != 0) && __ATTEMPTS__ < 2);
+
+
+
+#define RESTART_END_POINTER \
+} \
+if (status != SGX_SUCCESS || *errStatus != 0) { \
+spdlog::error(__FUNCTION__);\
+spdlog::error("Restarting sgx on status errStatus... {} {}", status, *errStatus);                            \
+reinitEnclave(); \
+} \
+} while ((status != SGX_SUCCESS || *errStatus != 0) && __ATTEMPTS__ < 2);