Fixing

secure_enclave/BLSUtils.cpp

@@ -3,6 +3,7 @@
 //
 
 #define GMP_WITH_SGX
+
 #include <string.h>
 #include <cstdint>
 #include "../sgxwallet_common.h"
@@ -14,58 +15,55 @@
 
 std::string *stringFromKey(libff::alt_bn128_Fr *_key) {
 
-  mpz_t t;
-  mpz_init(t);
+    mpz_t t;
+    mpz_init(t);
 
-  _key->as_bigint().to_mpz(t);
+    _key->as_bigint().to_mpz(t);
 
-  char arr[mpz_sizeinbase(t, 10) + 2];
+    char arr[mpz_sizeinbase(t, 10) + 2];
 
-  char *tmp = mpz_get_str(arr, 10, t);
-  mpz_clear(t);
+    char *tmp = mpz_get_str(arr, 10, t);
+    mpz_clear(t);
 
-  return new std::string(tmp);
+    return new std::string(tmp);
 }
 
-std::string *stringFromFq(libff::alt_bn128_Fq*_fq) {
+std::string *stringFromFq(libff::alt_bn128_Fq *_fq) {
 
-  mpz_t t;
-  mpz_init(t);
+    mpz_t t;
+    mpz_init(t);
 
-  _fq->as_bigint().to_mpz(t);
+    _fq->as_bigint().to_mpz(t);
 
-  char arr[mpz_sizeinbase(t, 10) + 2];
+    char arr[mpz_sizeinbase(t, 10) + 2];
 
-  char *tmp = mpz_get_str(arr, 10, t);
-  mpz_clear(t);
+    char *tmp = mpz_get_str(arr, 10, t);
+    mpz_clear(t);
 
-  return new std::string(tmp);
+    return new std::string(tmp);
 }
 
 std::string *stringFromG1(libff::alt_bn128_G1 *_g1) {
 
 
-  _g1->to_affine_coordinates();
+    _g1->to_affine_coordinates();
 
-  auto sX = stringFromFq(&_g1->X);
-  auto sY = stringFromFq(&_g1->Y);
+    auto sX = stringFromFq(&_g1->X);
+    auto sY = stringFromFq(&_g1->Y);
 
-  auto sG1 = new std::string(*sX + ":" +  *sY);
+    auto sG1 = new std::string(*sX + ":" + *sY);
 
-  delete(sX);
-  delete(sY);
+    delete (sX);
+    delete (sY);
 
-  return sG1;
+    return sG1;
 
 }
 
 
+libff::alt_bn128_Fr *keyFromString(const char *_keyString) {
 
-
-
-libff::alt_bn128_Fr *keyFromString(const char* _keyString) {
-
-  return new libff::alt_bn128_Fr(_keyString);
+    return new libff::alt_bn128_Fr(_keyString);
 }
 
 
@@ -78,10 +76,7 @@ void init() {
     libff::init_alt_bn128_params();
 }
 
-bool check_key(int *err_status, char *err_string, const char *_keyString) {
-
-
-
+void check_key(int *err_status, char *err_string, const char *_keyString) {
 
     uint64_t keyLen = strnlen(_keyString, MAX_KEY_LENGTH);
 
@@ -89,56 +84,49 @@ bool check_key(int *err_status, char *err_string, const char *_keyString) {
 
     if (keyLen == MAX_KEY_LENGTH) {
         snprintf(err_string, MAX_ERR_LEN, "keyLen != MAX_KEY_LENGTH");
-        return false;
+        return;
     }
 
+
     *err_status = -2;
 
+
+    if (_keyString == nullptr) {
+        snprintf(err_string, BUF_LEN, "Null key");
+        return;
+    }
+
+    *err_status = -3;
+
     // check that key is padded with 0s
 
     for (int i = keyLen; i < MAX_KEY_LENGTH; i++) {
         if (_keyString[i] != 0) {
-            snprintf(err_string, BUF_LEN,"Unpadded key");
-            return false;
+            snprintf(err_string, BUF_LEN, "Unpadded key");
         }
     }
 
+    std::string ks(_keyString);
 
+    // std::string  keyString =
+    // "4160780231445160889237664391382223604184857153814275770598791864649971919844";
 
-  *err_status = -1;
-
-
-  if (_keyString == nullptr)
-    return false;
-
-  std::string ks(_keyString);
-
-  // std::string  keyString =
-  // "4160780231445160889237664391382223604184857153814275770598791864649971919844";
+    auto key = keyFromString(ks.c_str());
 
-  auto key = keyFromString(ks.c_str());
+    auto s1 = stringFromKey(key);
 
-  auto s1 = stringFromKey(key);
-
-  if (s1->compare(ks) != 0) {
-      throw std::exception();
-  }
-
-  if (s1->size() < 10)
-    return false;
-
-  if (s1->size() >= 100)
-    return false;
+    if (s1->compare(ks) != 0) {
+        throw std::exception();
+    }
 
-  *err_status = 0;
+    *err_status = 0;
 
-  return true;
+    return;
 }
 
 
-
-bool sign(const char *_keyString, const char* _hashXString, const char* _hashYString,
-       char sig[BUF_LEN]) {
+bool sign(const char *_keyString, const char *_hashXString, const char *_hashYString,
+          char sig[BUF_LEN]) {
 
 
     libff::init_alt_bn128_params();
@@ -146,28 +134,27 @@ bool sign(const char *_keyString, const char* _hashXString, const char* _hashYSt
 
     auto key = keyFromString(_keyString);
 
-         libff::alt_bn128_Fq hashX(_hashXString);
-         libff::alt_bn128_Fq hashY(_hashYString);
-         libff::alt_bn128_Fq hashZ = 1;
-
+    libff::alt_bn128_Fq hashX(_hashXString);
+    libff::alt_bn128_Fq hashY(_hashYString);
+    libff::alt_bn128_Fq hashZ = 1;
 
-         libff::alt_bn128_G1 hash(hashX, hashY, hashZ);
 
+    libff::alt_bn128_G1 hash(hashX, hashY, hashZ);
 
-         libff::alt_bn128_G1 sign = key->as_bigint() * hash;  // sign
 
-         sign.to_affine_coordinates();
+    libff::alt_bn128_G1 sign = key->as_bigint() * hash;  // sign
 
-         auto r = stringFromG1(&sign);
+    sign.to_affine_coordinates();
 
-         memset(sig, 0, BUF_LEN);
+    auto r = stringFromG1(&sign);
 
-         strncpy(sig, r->c_str(), BUF_LEN);
+    memset(sig, 0, BUF_LEN);
 
-         delete r;
+    strncpy(sig, r->c_str(), BUF_LEN);
 
-         return true;
+    delete r;
 
+    return true;
 
 
 }

secure_enclave/BLSUtils.h

@@ -13,7 +13,7 @@
 #define EXTERNC
 #endif
 
-EXTERNC bool check_key(int *err_status, char *err_string, const char* _keyString);
+EXTERNC void check_key(int *err_status, char *err_string, const char* _keyString);
 
 EXTERNC bool sign(const char *_keyString, const char* _hashXString, const char* _hashYString,
            char* _sig);

secure_enclave/secure_enclave.c

@@ -127,6 +127,7 @@ void encrypt_key(int *err_status, char *err_string, char *key,
     init();
 
     *err_status = -1;
+
     memset(err_string, 0, BUF_LEN);