SKALE-3067-cleanup-sgx

ECDSACrypto.cpp

@@ -67,6 +67,7 @@ vector <string> genECDSAKey() {
     vector <string> keys(3);
 
     vector<char> hexEncrKey(BUF_LEN * 2, 0);
+
     carray2Hex(encr_pr_key.data(), enc_len, hexEncrKey.data());
     keys.at(0) = hexEncrKey.data();
     keys.at(1) = string(pub_key_x.data()) + string(pub_key_y.data());

secure_enclave/EnclaveCommon.cpp

@@ -44,47 +44,56 @@ uint8_t *getThreadLocalDecryptedDkgPoly() {
 
 
 string *stringFromKey(libff::alt_bn128_Fr *_key) {
-    try {
-        mpz_t t;
-        mpz_init(t);
+    string* ret = nullptr;
+    mpz_t t;
+    mpz_init(t);
 
-        _key->as_bigint().to_mpz(t);
+    SAFE_CHAR_BUF(arr, BUF_LEN);
 
-        char arr[mpz_sizeinbase(t, 10) + 2];
+    try {
+        _key->as_bigint().to_mpz(t);
 
         char *tmp = mpz_get_str(arr, 10, t);
-        mpz_clear(t);
 
-        return new string(tmp);
+        ret = new string(tmp);
+        goto clean;
     } catch (exception &e) {
         LOG_ERROR(e.what());
-        return nullptr;
+        goto clean;
     } catch (...) {
         LOG_ERROR("Unknown throwable");
-        return nullptr;
+        goto clean;
     }
+
+    clean:
+    mpz_clear(t);
+    return ret;
 }
 
 string *stringFromFq(libff::alt_bn128_Fq *_fq) {
+
+    string* ret = nullptr;
+    mpz_t t;
+    mpz_init(t);
+    SAFE_CHAR_BUF(arr, BUF_LEN);
+
     try {
-        mpz_t t;
-        mpz_init(t);
 
         _fq->as_bigint().to_mpz(t);
 
-        char arr[mpz_sizeinbase(t, 10) + 2];
-
         char *tmp = mpz_get_str(arr, 10, t);
-        mpz_clear(t);
-
-        return new string(tmp);
+        ret =  new string(tmp);
     } catch (exception &e) {
         LOG_ERROR(e.what());
-        return nullptr;
+        goto clean;
     } catch (...) {
         LOG_ERROR("Unknown throwable");
-        return nullptr;
+        goto clean;
     }
+
+    clean:
+    mpz_clear(t);
+    return ret;
 }
 
 string *stringFromG1(libff::alt_bn128_G1 *_g1) {

secure_enclave/EnclaveCommon.h

@@ -64,5 +64,8 @@ extern unsigned char* globalRandom;
 
 extern domain_parameters curve;
 
+#define SAFE_FREE(__X__) if (!__X__) {free(__X__); __X__ = NULL;}
+#define SAFE_CHAR_BUF(__X__, __Y__)  ;char __X__ [ __Y__ ]; memset(__X__, 0, __Y__);
+
 
 #endif //SGXWALLET_ENCLAVECOMMON_H

secure_enclave/secure_enclave.c

@@ -56,8 +56,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "EnclaveConstants.h"
 #include "EnclaveCommon.h"
 
-#define SAFE_FREE(__X__) if (!__X__) {free(__X__); __X__ = NULL;}
-#define SAFE_CHAR_BUF(__X__, __Y__)  ;char __X__ [ __Y__ ]; memset(__X__, 0, __Y__);
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)