Merge pull request #31 from...

Merge pull request #31 from skalenetwork/enhancement/SKALE-2019-Rename-private-key-for-enclave-signing

Enhancement/skale 2019 rename private key for enclave signing

LevelDB.cpp

@@ -62,9 +62,6 @@ std::shared_ptr<std::string> LevelDB::readString(const std::string &_key) {
 
     auto status = db->Get(readOptions, _key, &*result);
 
-//    if (result == nullptr) {
-//      throw RPCException(KEY_SHARE_DOES_NOT_EXIST, "Data with this name does not exist");
-//    }
     if (DEBUG_PRINT) {
       spdlog::info("key to read from db: {}",_key );
       //std::cerr << "key to read from db: " << _key << std::endl;
@@ -107,22 +104,6 @@ void LevelDB::deleteDHDKGKey (const std::string &_key) {
       spdlog::info("key deleted: {}",full_key );
       //std::cerr << "key deleted " << full_key << std::endl;
     }
-
-}
-
-void LevelDB::deleteOlegKey (const std::string &_key) {
-
-    std::lock_guard<std::recursive_mutex> lock(mutex);
-
-    std::string full_key = "key" + _key;
-
-    auto status = db->Delete(writeOptions, Slice(_key));
-
-    throwExceptionOnError(status);
-
-    if (DEBUG_PRINT) {
-      std::cerr << "key deleted " << full_key << std::endl;
-    }
 }
 
 void LevelDB::deleteTempNEK(const std::string &_key){

LevelDB.h

@@ -61,8 +61,6 @@ public:
 
     void deleteDHDKGKey (const std::string &_key);
 
-    void deleteOlegKey (const std::string &_key);
-
     void deleteTempNEK (const std::string &_key);
 
     void deleteKey(const std::string &_key);

SGXWalletServer.cpp

@@ -602,7 +602,7 @@ Json::Value CreateBLSPrivateKeyImpl(const std::string & BLSKeyName, const std::s
     std::shared_ptr<std::string> encryptedKeyHex_ptr = readFromDb(EthKeyName);
 
     bool res = CreateBLSShare(BLSKeyName, SecretShare.c_str(), encryptedKeyHex_ptr->c_str());
-     if ( res){
+     if (res){
          spdlog::info("BLS KEY SHARE CREATED ");
      }
      else {
@@ -612,6 +612,8 @@ Json::Value CreateBLSPrivateKeyImpl(const std::string & BLSKeyName, const std::s
      for ( int i = 0; i < n; i++){
        std::string name = polyName + "_" + std::to_string(i) + ":";
        levelDb -> deleteDHDKGKey(name);
+       std::string shareG2_name = "shareG2_" + polyName + "_" + std::to_string(i) + ":";
+       levelDb -> deleteKey(shareG2_name);
      }
 
   } catch (RPCException &_e) {

ServerInit.cpp

@@ -85,6 +85,11 @@ void init_daemon() {
     static std::string csr_status_dbname = "SGXData/CSR_STATUS_DB";
     csrStatusDb = new LevelDB(csr_status_dbname);
 
+    std::shared_ptr<std::string> encr_SEK_ptr = levelDb->readString("SEK");
+    if (encr_SEK_ptr == nullptr){
+      spdlog::info("SEK was not created yet");
+    }
+
 }
 
 
@@ -106,7 +111,6 @@ void init_enclave() {
 
     if ( DEBUG_PRINT) {
       spdlog::info("SGX_DEBUG_FLAG = {}", SGX_DEBUG_FLAG);
-      //std::cerr << "SGX_DEBUG_FLAG = " << SGX_DEBUG_FLAG << std::endl;
     }
 
     status = sgx_create_enclave_search(ENCLAVE_NAME, SGX_DEBUG_FLAG, &token,

secure_enclave/Makefile.am

@@ -50,7 +50,7 @@ include $(top_srcdir)/build-aux/sgx_enclave.am
 
 ENCLAVE=secure_enclave
 ENCLAVE_CONFIG=$(ENCLAVE).config.xml
-ENCLAVE_KEY=$(ENCLAVE)_private.pem
+ENCLAVE_KEY=test_insecure_private_key.pem       #$(ENCLAVE)_private.pem
 
 
 ## Provide additional flags to sgx_sign when signing the enclave.

secure_enclave/Makefile.in

@@ -343,7 +343,7 @@ CLEANFILES = $(ENCLAVE).signed.so secure_enclave_t.c \
 @ENCLAVE_RELEASE_SIGN_FALSE@nodist_signed_enclave_debug_SOURCES = signed_enclave_debug.c
 ENCLAVE = secure_enclave
 ENCLAVE_CONFIG = $(ENCLAVE).config.xml
-ENCLAVE_KEY = $(ENCLAVE)_private.pem
+ENCLAVE_KEY = test_insecure_private_key.pem       #$(ENCLAVE)_private.pem
 secure_enclave_SOURCES = secure_enclave_t.c secure_enclave_t.h \
 	secure_enclave.c \
 	curves.c domain_parameters.c numbertheory.c point.c signature.c DH_dkg.c \

secure_enclave/secure_enclave.c

@@ -894,5 +894,25 @@ void get_bls_pub_key(int *err_status, char* err_string, uint8_t* encrypted_key,
   }
 }
 
+void generate_SEK(int *err_status, char *err_string,
+                        uint8_t *encrypted_SEK, uint32_t *enc_len){
+
+  unsigned char* rand_char = (unsigned char*)malloc(16);
+  sgx_read_rand( rand_char, 16);
+
+  uint32_t sealedLen = sgx_calc_sealed_data_size(0, 32);
+
+  sgx_status_t status = sgx_seal_data(0, NULL, 32, (uint8_t *)rand_char, sealedLen,(sgx_sealed_data_t*)encrypted_SEK);
+  if( status !=  SGX_SUCCESS) {
+    snprintf(err_string, BUF_LEN,"seal SEK failed");
+    *err_status = status;
+    return;
+  }
+
+  *enc_len = sealedLen;
+
+    free(rand_char);
+}
+
 
 

secure_enclave/secure_enclave.edl

@@ -157,6 +157,12 @@ enclave {
                                 uint8_t _t,
                                 uint8_t _n,
                                 uint8_t ind1);
+
+         public void generate_SEK(
+                                [user_check] int *err_status,
+                                [out, count = 1024] char *err_string,
+                                [in, count = 1024] uint8_t *encrypted_SEK,
+                                [user_check] uint32_t *enc_len);
 	};
 
 

testw.cpp

@@ -885,10 +885,6 @@ TEST_CASE("API test", "[api_test]") {
     cerr << "Client inited" << endl;
 
     try {
-        //levelDb->deleteOlegKey("0");
-        //levelDb->deleteOlegKey("1");
-       // levelDb->deleteDHDKGKey("p2_0:");
-        //levelDb->deleteDHDKGKey("p2_1:");
 //        for ( uint8_t i = 0; i < 2; i++) {
 //        levelDb->deleteKey("POLY:SCHAIN_ID:1:NODE_ID:" + std::to_string(i) +
 //                             ":DKG_ID:0");