Fixing

testw.cpp

@@ -59,58 +59,58 @@ sgx_enclave_id_t eid;
 sgx_status_t status;
 int updated;
 
+char *encryptKey2Hex(int *errStatus, char *err_string, const char *_key) {
+    char *keyArray = (char *) calloc(BUF_LEN, 1);
+    uint8_t *encryptedKey = (uint8_t *) calloc(BUF_LEN, 1);
+    char *errMsg = (char *) calloc(BUF_LEN, 1);
+    strncpy((char *) keyArray, (char *) _key, BUF_LEN);
 
-TEST_CASE("BLS key encrypt", "[bls-key-encrypt]") {
-    {
-
-
-        init_all();
+    *errStatus = -1;
 
-        const char *key = "4160780231445160889237664391382223604184857153814275770598"
-                          "791864649971919844";
-
-        char *keyArray = (char *) calloc(BUF_LEN, 1);
-        uint8_t *encryptedKey = (uint8_t *) calloc(BUF_LEN, 1);
+    unsigned int encryptedLen = 0;
 
+    status = encrypt_key(eid, errStatus, errMsg, keyArray, encryptedKey, &encryptedLen);
 
-        char *errMsg = (char *) calloc(BUF_LEN, 1);
+    if (status != SGX_SUCCESS) {
+        *errStatus = -1;
+        return nullptr;
+    }
 
-        strncpy((char *) keyArray, (char *) key, BUF_LEN);
+    if (*errStatus != 0) {
+        return nullptr;
+    }
 
-        int errStatus = 0;
 
-        unsigned int encryptedLen = 0;
+    char *result = (char *) calloc(2 * BUF_LEN, 1);
 
-        status = encrypt_key(eid, &errStatus, errMsg, keyArray, encryptedKey, &encryptedLen);
+    carray2Hex(encryptedKey, encryptedLen, result);
 
-        REQUIRE(status == SGX_SUCCESS);
-        REQUIRE(errStatus == 0);
+    return result;
+}
 
-        printf("Encrypt key completed with status: %d %s \n", errStatus, errMsg);
-        printf(" Encrypted key len %d\n", encryptedLen);
 
+TEST_CASE("BLS key encrypt", "[bls-key-encrypt]") {
 
-        char result[2 * BUF_LEN];
 
-        carray2Hex(encryptedKey, encryptedLen, result);
+    init_all();
 
-        uint64_t decodedLen = 0;
+    const char *key = "4160780231445160889237664391382223604184857153814275770598"
+                      "791864649971919844";
 
-        uint8_t decoded[BUF_LEN];
 
-        REQUIRE(hex2carray(result, &decodedLen, decoded));
+    int errStatus = -1;
 
-        for (uint64_t i = 0; i < decodedLen; i++) {
-            REQUIRE(decoded[i] == encryptedKey[i]);
-        }
+    char *errMsg = (char *) calloc(BUF_LEN, 1);
 
-        REQUIRE(decodedLen == encryptedLen);
+    char *encryptedKeyHex = encryptKey2Hex(&errStatus, errMsg, key);
 
-        gmp_printf("Result: %s", result);
+    REQUIRE(encryptedKeyHex != nullptr);
+    REQUIRE(errStatus == 0);
 
-        gmp_printf("\n Length: %d \n", encryptedLen);
+    printf("Encrypt key completed with status: %d %s \n", errStatus, errMsg);
+    printf("Encrypted key len %d\n", (int) strlen(encryptedKeyHex));
+    printf("Encrypted key %s \n", encryptedKeyHex);
 
-    }
 }
 
 
@@ -161,7 +161,7 @@ TEST_CASE("BLS key encrypt/decrypt", "[bls-key-encrypt-decrypt]") {
 
         gmp_printf("\n Encrypted length: %d \n", encryptedLen);
 
-        char *plaintextKey = (char*) calloc(BUF_LEN, 1);
+        char *plaintextKey = (char *) calloc(BUF_LEN, 1);
 
         status = decrypt_key(eid, &errStatus, errMsg, decoded, decodedLen, plaintextKey);
 
@@ -171,7 +171,7 @@ TEST_CASE("BLS key encrypt/decrypt", "[bls-key-encrypt-decrypt]") {
 
         REQUIRE(strcmp(plaintextKey, key) == 0);
 
-        for (int i = 0 ; i < BUF_LEN; i++) {
+        for (int i = 0; i < BUF_LEN; i++) {
             REQUIRE(plaintextKey[i] == keyArray[i]);
         }