Fixing SGX

BLSCrypto.cpp

@@ -17,8 +17,61 @@
 
 #include "BLSCrypto.h"
 
+int char2int(char _input) {
+  if (_input >= '0' && _input <= '9')
+    return _input - '0';
+  if (_input >= 'A' && _input <= 'F')
+    return _input - 'A' + 10;
+  if (_input >= 'a' && _input <= 'f')
+    return _input - 'a' + 10;
+  return -1;
+}
+
+
+
+void  carray2Hex(const unsigned char *d, int _len, char* _hexArray) {
+
+  char hexval[16] = {'0', '1', '2', '3', '4', '5', '6', '7',
+                     '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+  for (int j = 0; j < _len; j++) {
+    _hexArray[j * 2] = hexval[((d[j] >> 4) & 0xF)];
+    _hexArray[j * 2 + 1] = hexval[(d[j]) & 0x0F];
+  }
+
+  _hexArray[_len * 2] = 0;
+
+}
+
+
+bool hex2carray(const char * _hex, uint64_t  *_bin_len,
+                uint8_t* _bin ) {
+
+  int len = strnlen(_hex, 2 * BUF_LEN);
+
+
+  if (len == 0 && len % 2 == 1)
+    return false;
+
+  *_bin_len = len / 2;
+
+  for (int i = 0; i < len / 2; i++) {
+    int high = char2int((char)_hex[i * 2]);
+    int low = char2int((char)_hex[i * 2 + 1]);
+
+    if (high < 0 || low < 0) {
+      return false;
+    }
+
+    _bin[i] = (unsigned char) (high * 16 + low);
+  }
+
+  return true;
+
+}
+
 
-extern "C" void init_daemon() {
+void init_daemon() {
 
   libff::init_alt_bn128_params();
 

BLSCrypto.h

@@ -15,7 +15,11 @@ EXTERNC void init_daemon();
 
 EXTERNC bool sign(char* encryptedKeyHex, char* hashHex, size_t t, size_t n, char* _sig);
 
+EXTERNC int char2int(char _input);
 
+EXTERNC void  carray2Hex(const unsigned char *d, int _len, char* _hexArray);
+EXTERNC bool hex2carray(const char * _hex, uint64_t  *_bin_len,
+                        uint8_t* _bin );
 
 
 

BLSPrivateKeyShareSGX.cpp

@@ -31,6 +31,8 @@ using namespace std;
 #include "sgxd_common.h"
 #include "sgxd.h"
 
+#include "BLSCrypto.h"
+
 #include "BLSPrivateKeyShareSGX.h"
 
 

secure_enclave/BLSUtils.cpp

@@ -128,3 +128,7 @@ bool sign(const char *_keyString, const char* _hashXString, const char* _hashYSt
 
 
 }
+
+
+
+

secure_enclave/BLSUtils.h

@@ -19,4 +19,12 @@ EXTERNC bool sign(const char *_keyString, const char* _hashXString, const char*
            char* _sig);
 
 
+
+EXTERNC int char2int(char _input);
+
+EXTERNC void  carray2Hex(const unsigned char *d, int _len, char* _hexArray);
+EXTERNC bool hex2carray(const char * _hex, uint64_t  *_bin_len,
+                       uint8_t* _bin );
+
+
 #endif //SGXD_BLSUTILS_H

sgxd_common.h

@@ -26,59 +26,6 @@
 
 #define ADD_ENTROPY_SIZE 32
 
-inline int char2int(char _input) {
-    if (_input >= '0' && _input <= '9')
-        return _input - '0';
-    if (_input >= 'A' && _input <= 'F')
-        return _input - 'A' + 10;
-    if (_input >= 'a' && _input <= 'f')
-        return _input - 'a' + 10;
-    return -1;
-}
-
-
-
-inline void  carray2Hex(const unsigned char *d, int _len, char* _hexArray) {
-
-    char hexval[16] = {'0', '1', '2', '3', '4', '5', '6', '7',
-                              '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-    for (int j = 0; j < _len; j++) {
-        _hexArray[j * 2] = hexval[((d[j] >> 4) & 0xF)];
-        _hexArray[j * 2 + 1] = hexval[(d[j]) & 0x0F];
-    }
-
-    _hexArray[_len * 2] = 0;
-
-}
-
-
-inline bool hex2carray(const char * _hex, uint64_t  *_bin_len,
-    uint8_t* _bin ) {
-
-    int len = strnlen(_hex, 2 * BUF_LEN);
-
-
-    if (len == 0 && len % 2 == 1)
-        return false;
-
-    *_bin_len = len / 2;
-
-    for (int i = 0; i < len / 2; i++) {
-        int high = char2int((char)_hex[i * 2]);
-        int low = char2int((char)_hex[i * 2 + 1]);
-
-        if (high < 0 || low < 0) {
-            return false;
-        }
-
-        _bin[i] = (unsigned char) (high * 16 + low);
-    }
-
-    return true;
-
-}
-
 
 
 #endif //SGXD_SGXD_COMMON_H