SKLAE-2002 small refactoring

.gitignore

@@ -46,3 +46,7 @@
 /m4
 /.testw.py.swp
 /cert_util
+/secure_enclave/*.o
+/*.user
+/cert/*.csr
+/cert/*.crt
\ No newline at end of file

SEKManager.cpp

@@ -155,10 +155,6 @@ void gen_SEK(){
     } while (case_insensitive_match(confirm_str, buffer)); //(strcmp(confirm_str.c_str(), buffer.c_str()) != 0);
   }
 
-  if (system("reset") != 0) {
-      cerr << "Could not execute reset" << endl;
-  }
-
   LevelDB::getLevelDb()->writeDataUnique("SEK", hexEncrKey.data());
 
   create_test_key();

secure_enclave/secure_enclave.c

@@ -281,7 +281,6 @@ void trustedGetPublicEcdsaKey(int *errStatus, char *errString,
 
 void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivateKey, uint32_t dec_len,
                  unsigned char *hash, char *sigR, char *sigS, uint8_t *sig_v, int base) {
-
     LOG_DEBUG (__FUNCTION__);
 
     char* arrM = NULL;
@@ -290,12 +289,6 @@ void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivate
 
     char* privateKey = calloc(ECDSA_SKEY_LEN,1);
 
-    mpz_t privateKeyMpz;
-    mpz_init(privateKeyMpz);
-    mpz_t msgMpz;
-
-
-
     signature sign = signature_init();
 
     domain_parameters curve = domain_parameters_init();
@@ -318,8 +311,8 @@ void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivate
         goto clean;
     }
 
+    mpz_t msgMpz;
     mpz_init(msgMpz);
-
     if (mpz_set_str(msgMpz, hash, 16) == -1) {
         *errStatus = 1;
         snprintf(errString, BUF_LEN, "invalid message hash %s", hash);
@@ -345,7 +338,8 @@ void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivate
         goto clean;
     }
     
-
+    mpz_t privateKeyMpz;
+    mpz_init(privateKeyMpz);
     if (mpz_set_str(privateKeyMpz, privateKey, ECDSA_SKEY_BASE) == -1) {
         *errStatus = -1;
         snprintf(errString, BUF_LEN, "mpz_set_str(privateKeyMpz ...) failed");
@@ -357,8 +351,6 @@ void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivate
 
     signature_extract_public_key(publicKey, privateKeyMpz, curve);
 
-
-
     if (!signature_verify(msgMpz, sign, publicKey, curve)) {
         *errStatus = 2;
         snprintf(errString, BUF_LEN, "ECDSA sig not verified");
@@ -383,9 +375,9 @@ void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivate
     
     signature_free(sign);
 
-    if (privateKey)
+    if (privateKey) {
         free(privateKey);
-
+     }
 
     if (arrR) {
         free(arrR);
@@ -396,7 +388,6 @@ void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivate
     }
 
     return;
-
 }