Fixing backup key

Dockerfile

 FROM skalenetwork/sgxwallet_base:latest
 
 COPY . /usr/src/sdk
-RUN apt update && apt install -y curl
+RUN apt update && apt install -y curl secure-delete
 WORKDIR /usr/src/sdk
 RUN touch /var/hwmode
 RUN ./autoconf.bash

DockerfileRelease

@@ -2,7 +2,7 @@ FROM skalenetwork/sgxwallet_base:latest
 
 COPY . /usr/src/sdk
 RUN cp -f secure_enclave/secure_enclave.config.xml.release secure_enclave/secure_enclave.config.xml
-RUN apt update && apt install -y curl
+RUN apt update && apt install -y curl secure-delete
 WORKDIR /usr/src/sdk
 #Test signing key generation
 RUN cd scripts && ./generate_signing_key.bash

DockerfileSimulation

 FROM skalenetwork/sgxwallet_base:latest
 
 
-RUN apt update &&  apt install -y curl
+RUN apt update &&  apt install -y curl secure-delete
 
 RUN ccache -sz
 

SEKManager.cpp

@@ -78,6 +78,9 @@ void create_test_key() {
   LevelDB::getLevelDb() -> writeDataUnique("TEST_KEY", hexEncrKey.data());
 }
 
+
+#include <experimental/filesystem>
+
 bool check_SEK(const std::string& SEK) {
   std::shared_ptr <std::string> test_key_ptr = LevelDB::getLevelDb() -> readString("TEST_KEY");
   vector<uint8_t> encr_test_key(BUF_LEN, 0);
@@ -131,7 +134,10 @@ void gen_SEK() {
   char SEK[65];
   memset(SEK, 0, 65);
 
+  spdlog::error("Generating backup key. Will be stored in backup_key.txt ... " );
+
   status = trustedGenerateSEK(eid, &err_status, errMsg.data(), encr_SEK.data(), &enc_len, SEK);
+
   if ( status != SGX_SUCCESS ) {
     throw SGXException(status, errMsg.data()) ;
   }
@@ -140,19 +146,28 @@ void gen_SEK() {
     throw SGXException(err_status, errMsg.data()) ;
   }
 
+    if ( strnlen(SEK,33) != 32) {
+        throw SGXException(-1, "strnlen(SEK,33) != 32" ) ;
+    }
+
   vector<char> hexEncrKey(2 * enc_len + 1, 0);
 
   carray2Hex(encr_SEK.data(), enc_len, hexEncrKey.data());
 
   std::ofstream sek_file("backup_key.txt");
   sek_file.clear();
-
-  cout << "ATTENTION! YOUR BACKUP KEY WILL BE WRITTEN INTO backup_key.txt.\n" <<
-          "PLEASE COPY IT TO THE SAFE PLACE AND THEN DELETE THE FILE MANUALLY BY RUNNING THE FOLLOWING COMMAND:\n" <<
-          "`docker exec -it <SGX_CONTAINER_NAME> bash && apt-get install secure-delete && srm -vz backup_key.txt`" << endl;
+  
   sek_file << SEK;
 
-  if (!autoconfirm) {
+
+    cout << "ATTENTION! YOUR BACKUP KEY HAS BEEN WRITTEN INTO sgx_data/backup_key.txt \n" <<
+         "PLEASE COPY IT TO THE SAFE PLACE AND THEN DELETE THE FILE MANUALLY BY RUNNING THE FOLLOWING COMMAND:\n" <<
+         "apt-get install secure-delete && srm -vz sgx_data/backup_key.txt" << endl;
+
+
+
+
+    if (!autoconfirm) {
     std::string confirm_str = "I confirm";
     std::string buffer;
     do {
@@ -162,6 +177,9 @@ void gen_SEK() {
     } while (case_insensitive_match(confirm_str, buffer));
   }
 
+
+
+
   LevelDB::getLevelDb()->writeDataUnique("SEK", hexEncrKey.data());
 
   create_test_key();

secure_enclave/secure_enclave.c

@@ -228,6 +228,7 @@ void sealHexSEK(int *errStatus, char *errString,
 
     CHECK_STATE(encrypted_sek);
     CHECK_STATE(sek_hex);
+    CHECK_STATE(strnlen(sek_hex, 33) == 32)
     
 
     uint64_t plaintextLen = strlen(sek_hex + 1);