Merge pull request #38 from skalenetwork/SKALE-2077-cleanup-sgx

SKALE-2077 cleaned up SGX

.github/workflows/dockerimagesim.yml

@@ -18,6 +18,10 @@ jobs:
       run: git submodule update --init --recursive
     - name: Build the Docker image
       run: docker build . --file DockerfileSimulation --tag  skalenetwork/sgxwalletsim:latest
+    - name: run docker image
+      run: docker run -v ${PWD}/sgx_data:/usr/src/sdk/sgx_data -d --network=host skalenetwork/sgxwalletsim:latest
+    - name: sleep and check
+      run: sleep 5; scripts/docker_test.py
     - name: push docker image
       run:  docker push skalenetwork/sgxwalletsim:latest
 

.gitignore

 # Created by .ignore support plugin (hsz.mobi)
 .idea/
+sgx-gmp/
 gmp-build
 tgmp-build
 install-sh
@@ -13,6 +14,10 @@ secure_enclave.edl
 am--include-marker
 *.o
 aclocal.m4
+missing
+compile
+depcomp
+ltmain.sh
 secure_enclave.signed.so
 sgxgmpmath
 sgxgmppi

BLSCrypto.cpp

@@ -51,6 +51,7 @@
 #include "RPCException.h"
 
 #include "spdlog/spdlog.h"
+#include "common.h"
 
 int char2int(char _input) {
   if (_input >= '0' && _input <= '9')
@@ -135,11 +136,11 @@ bool hex2carray2(const char * _hex, uint64_t  *_bin_len,
 bool sign(const char* _encryptedKeyHex, const char* _hashHex, size_t _t, size_t _n, size_t _signerIndex,
     char* _sig) {
 
-  //std::cerr << "ENTER SIGN" << std::endl;
+  //cerr << "ENTER SIGN" << endl;
 
-  auto keyStr = std::make_shared<std::string>(_encryptedKeyHex);
+  auto keyStr = make_shared<string>(_encryptedKeyHex);
 
-  auto hash = std::make_shared<std::array<uint8_t, 32>>();
+  auto hash = make_shared<array<uint8_t, 32>>();
 
   uint64_t binLen;
 
@@ -150,9 +151,9 @@ bool sign(const char* _encryptedKeyHex, const char* _hashHex, size_t _t, size_t
 
 
 
-  auto keyShare = std::make_shared<BLSPrivateKeyShareSGX>(keyStr, _t, _n);
+  auto keyShare = make_shared<BLSPrivateKeyShareSGX>(keyStr, _t, _n);
 
-  //std::cerr << "keyShare created" << std::endl;
+  //cerr << "keyShare created" << endl;
  // {
     auto sigShare = keyShare->signWithHelperSGX(hash, _signerIndex);
  // }
@@ -161,14 +162,14 @@ bool sign(const char* _encryptedKeyHex, const char* _hashHex, size_t _t, size_t
 
   strncpy(_sig, sigShareStr->c_str(), BUF_LEN);
 
-  //std::string sigShareStr = keyShare->signWithHelperSGXstr(hash, _signerIndex);
+  //string sigShareStr = keyShare->signWithHelperSGXstr(hash, _signerIndex);
   //strncpy(_sig, sigShareStr.c_str(), BUF_LEN);
 
- // std::string test_sig = "8175162913343900215959836578795929492705714455632345516427532159927644835012:15265825550804683171644566522808807137117748565649051208189914766494241035855:9810286616503120081238481858289626967170509983220853777870754480048381194141:5";
- // auto sig_ptr = std::make_shared<std::string>(test_sig);
+ // string test_sig = "8175162913343900215959836578795929492705714455632345516427532159927644835012:15265825550804683171644566522808807137117748565649051208189914766494241035855:9810286616503120081238481858289626967170509983220853777870754480048381194141:5";
+ // auto sig_ptr = make_shared<string>(test_sig);
  // strncpy(_sig, sig_ptr->c_str(), BUF_LEN);
 
-  //std::cerr<< "sig " << _sig <<std::endl;
+  //cerr<< "sig " << _sig <<endl;
 
   return true;
 

BLSPrivateKeyShareSGX.cpp

@@ -21,7 +21,7 @@
   @date 2019
 */
 
-using namespace std;
+
 
 #include "BLSSigShare.h"
 #include "BLSSignature.h"
@@ -33,6 +33,7 @@ using namespace std;
 
 #include "BLSCrypto.h"
 #include "ServerInit.h"
+#include "common.h"
 
 #include "BLSPrivateKeyShareSGX.h"
 

CMakeLists.txt

-cmake_minimum_required(VERSION 3.12)
-project(sgxd)
+cmake_minimum_required(VERSION 3.15)
+project(sgxwallet)
 
 set(CMAKE_CXX_STANDARD 14)
 
 include_directories(.)
-include_directories(libff/libff/algebra/curves/alt_bn128)
-include_directories(libff/libff/algebra/curves/bn128)
-include_directories(libff/libff/algebra/curves/edwards)
-include_directories(libff/libff/algebra/curves/mnt)
-include_directories(libff/libff/algebra/curves/mnt/mnt4)
-include_directories(libff/libff/algebra/curves/mnt/mnt6)
-include_directories(libff/libff/common/default_types)
 include_directories(secure_enclave)
+include_directories(sgx-software-enable)
+include_directories(tgmp-build)
+include_directories(tgmp-build/include)
 
-add_custom_target(sgxd COMMAND make all
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        SOURCES
-        libff/libff/algebra/curves/alt_bn128/alt_bn128_g1.cpp
-        libff/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp
-        libff/libff/algebra/curves/alt_bn128/alt_bn128_init.cpp
-        libff/libff/algebra/curves/alt_bn128/alt_bn128_init.hpp
-        libff/libff/algebra/curves/alt_bn128/alt_bn128_pp.cpp
-        libff/libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp
-        libff/libff/algebra/curves/bn128/bn128_g1.cpp
-        libff/libff/algebra/curves/bn128/bn128_g1.hpp
-        libff/libff/algebra/curves/bn128/bn128_g2.cpp
-        libff/libff/algebra/curves/bn128/bn128_g2.hpp
-        libff/libff/algebra/curves/bn128/bn128_gt.cpp
-        libff/libff/algebra/curves/bn128/bn128_gt.hpp
-        libff/libff/algebra/curves/bn128/bn128_init.cpp
-        libff/libff/algebra/curves/bn128/bn128_init.hpp
-        libff/libff/algebra/curves/bn128/bn128_pairing.cpp
-        libff/libff/algebra/curves/bn128/bn128_pairing.hpp
-        libff/libff/algebra/curves/bn128/bn128_pp.cpp
-        libff/libff/algebra/curves/bn128/bn128_pp.hpp
-        libff/libff/algebra/curves/bn128/bn_utils.hpp
-        libff/libff/algebra/curves/bn128/bn_utils.tcc
-        libff/libff/algebra/curves/edwards/edwards_g1.cpp
-        libff/libff/algebra/curves/edwards/edwards_g1.hpp
-        libff/libff/algebra/curves/edwards/edwards_g2.cpp
-        libff/libff/algebra/curves/edwards/edwards_g2.hpp
-        libff/libff/algebra/curves/edwards/edwards_init.cpp
-        libff/libff/algebra/curves/edwards/edwards_init.hpp
-        libff/libff/algebra/curves/edwards/edwards_pairing.cpp
-        libff/libff/algebra/curves/edwards/edwards_pairing.hpp
-        libff/libff/algebra/curves/edwards/edwards_pp.cpp
-        libff/libff/algebra/curves/edwards/edwards_pp.hpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_g1.cpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_g2.cpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_init.cpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_init.hpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_pairing.cpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_pairing.hpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_pp.cpp
-        libff/libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_g1.cpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_g2.cpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_init.cpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_init.hpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_pairing.cpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_pairing.hpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_pp.cpp
-        libff/libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp
-        libff/libff/algebra/curves/mnt/mnt46_common.cpp
-        libff/libff/algebra/curves/mnt/mnt46_common.hpp
-        libff/libff/algebra/curves/tests/test_bilinearity.cpp
-        libff/libff/algebra/curves/tests/test_groups.cpp
-        libff/libff/algebra/curves/curve_utils.hpp
-        libff/libff/algebra/curves/curve_utils.tcc
-        libff/libff/algebra/curves/public_params.hpp
-        libff/libff/algebra/exponentiation/exponentiation.hpp
-        libff/libff/algebra/exponentiation/exponentiation.tcc
-        libff/libff/algebra/fields/tests/test_fields.cpp
-        libff/libff/algebra/fields/bigint.hpp
-        libff/libff/algebra/fields/bigint.tcc
-        libff/libff/algebra/fields/field_utils.hpp
-        libff/libff/algebra/fields/field_utils.tcc
-        libff/libff/algebra/fields/fp.hpp
-        libff/libff/algebra/fields/fp.tcc
-        libff/libff/algebra/fields/fp_aux.tcc
-        libff/libff/algebra/scalar_multiplication/multiexp.hpp
-        libff/libff/algebra/scalar_multiplication/multiexp.tcc
-        libff/libff/algebra/scalar_multiplication/multiexp_profile.cpp
-        libff/libff/algebra/scalar_multiplication/wnaf.hpp
-        libff/libff/algebra/scalar_multiplication/wnaf.tcc
-        libff/libff/common/default_types/ec_pp.hpp
-        libff/libff/common/double.cpp
-        libff/libff/common/double.hpp
-        libff/libff/common/profiling.cpp
-        libff/libff/common/profiling.hpp
-        libff/libff/common/rng.hpp
-        libff/libff/common/rng.tcc
-        libff/libff/common/template_utils.hpp
-        libff/libff/common/utils.cpp
-        libff/libff/common/utils.hpp
-        libff/libff/common/utils.tcc
+add_executable(sgxwallet
+        secure_enclave/AESUtils.c
+        secure_enclave/AESUtils.h
         secure_enclave/BLSEnclave.cpp
         secure_enclave/BLSEnclave.h
+        secure_enclave/curves.c
+        secure_enclave/curves.h
+        secure_enclave/DH_dkg.c
+        secure_enclave/DH_dkg.h
+        secure_enclave/DKGUtils.cpp
+        secure_enclave/DKGUtils.h
+        secure_enclave/domain_parameters.c
+        secure_enclave/domain_parameters.h
+        secure_enclave/enclave_common.h
+        secure_enclave/numbertheory.c
+        secure_enclave/numbertheory.h
+        secure_enclave/point.c
+        secure_enclave/point.h
         secure_enclave/secure_enclave.c
+        secure_enclave/secure_enclave.i
         secure_enclave/secure_enclave_t.c
         secure_enclave/secure_enclave_t.h
-        secure_enclave/DKGUtils.h
-        secure_enclave/DKGUtils.cpp
+        secure_enclave/signature.c
+        secure_enclave/signature.h
+        sgx-software-enable/sgx_capable.h
+        sgx-software-enable/sgx_enable.c
+        tgmp-build/include/sgx_tgmp.h
+        abstractCSRManagerServer.h
+        abstractregserver.h
+        abstractstubserver.h
+        BLSCrypto.cpp
+        BLSCrypto.h
+        BLSPrivateKeyShareSGX.cpp
+        BLSPrivateKeyShareSGX.h
+        catch.hpp
+        cert_util.cpp
+        common.h
         create_enclave.c
         create_enclave.h
+        CSRManagerServer.cpp
+        CSRManagerServer.h
+        DKGCrypto.cpp
+        DKGCrypto.h
+        ECDSACrypto.cpp
+        ECDSACrypto.h
+        LevelDB.cpp
+        LevelDB.h
         oc_alloc.c
+        RPCException.cpp
+        RPCException.h
         secure_enclave_u.c
         secure_enclave_u.h
+        SEKManager.cpp
+        SEKManager.h
+        ServerDataChecker.cpp
+        ServerDataChecker.h
+        ServerInit.cpp
+        ServerInit.h
         sgx_detect.h
         sgx_detect_linux.c
         sgx_stub.c
         sgx_stub.h
         sgx_tgmp.h
+        SGXRegistrationServer.cpp
+        SGXRegistrationServer.h
         sgxwallet.c
-        testw.cpp
-        )
+        sgxwallet.h
+        sgxwallet_common.h
+        SGXWalletServer.cpp
+        SGXWalletServer.h
+        SGXWalletServer.hpp
+        stubclient.cpp
+        stubclient.h
+        testw.cpp)

CSRManagerServer.cpp

@@ -12,6 +12,7 @@
 #include <jsonrpccpp/server/connectors/httpserver.h>
 
 #include "spdlog/spdlog.h"
+#include "common.h"
 
 
 CSRManagerServer *cs = nullptr;
@@ -27,15 +28,14 @@ Json::Value GetUnsignedCSRsImpl(){
   Json::Value result;
   result["status"] = 0;
   result["errorMessage"] = "";
-  //result["hashes"] =;
 
   try{
-    std::vector<std::string> hashes_vect = csrDb->writeKeysToVector1(MAX_CSR_NUM);
-    for (int i = 0; i < hashes_vect.size(); i++){
+    vector<string> hashes_vect = LevelDB::getCsrDb()->writeKeysToVector1(MAX_CSR_NUM);
+    for (int i = 0; i < (int) hashes_vect.size(); i++){
       result["hashes"][i] = hashes_vect.at(i);
     }
   } catch (RPCException &_e) {
-    std::cerr << " err str " << _e.errString << std::endl;
+    cerr << " err str " << _e.errString << endl;
     result["status"] = _e.status;
     result["errorMessage"] = _e.errString;
 
@@ -44,7 +44,7 @@ Json::Value GetUnsignedCSRsImpl(){
   return result;
 }
 
-Json::Value SignByHashImpl(const std::string& hash, int status){
+Json::Value SignByHashImpl(const string& hash, int status){
   Json::Value result;
   result["errorMessage"] = "";
 
@@ -53,46 +53,46 @@ Json::Value SignByHashImpl(const std::string& hash, int status){
       throw RPCException(-111, "Invalid csr status");
     }
 
-    std::string csr_db_key = "CSR:HASH:" + hash;
-    std::shared_ptr<std::string> csr_ptr = csrDb->readString(csr_db_key);
+    string csr_db_key = "CSR:HASH:" + hash;
+    shared_ptr<string> csr_ptr = LevelDB::getCsrDb()->readString(csr_db_key);
     if (csr_ptr == nullptr){
       throw RPCException(KEY_SHARE_DOES_NOT_EXIST, "HASH DOES NOT EXIST IN DB");
     }
 
     if (status == 0) {
-      std::string csr_name = "sgx_data/cert/" + hash + ".csr";
-      std::ofstream outfile(csr_name);
-      outfile << *csr_ptr << std::endl;
+      string csr_name = "sgx_data/cert/" + hash + ".csr";
+      ofstream outfile(csr_name);
+      outfile << *csr_ptr << endl;
       outfile.close();
       if (access(csr_name.c_str(), F_OK) != 0) {
-        csrDb->deleteKey(csr_db_key);
+        LevelDB::getCsrDb()->deleteKey(csr_db_key);
         throw RPCException(FILE_NOT_FOUND, "Csr does not exist");
       }
 
-      std::string signClientCert = "cd sgx_data/cert && ./create_client_cert " + hash;
+      string signClientCert = "cd sgx_data/cert && ./create_client_cert " + hash;
 
       if (system(signClientCert.c_str()) == 0) {
         spdlog::info("CLIENT CERTIFICATE IS SUCCESSFULLY GENERATED");
       } else {
         spdlog::info("CLIENT CERTIFICATE GENERATION FAILED");
-        csrDb->deleteKey(csr_db_key);
-        std::string status_db_key = "CSR:HASH:" + hash + "STATUS:";
-        csrStatusDb->deleteKey(status_db_key);
-        csrStatusDb->writeDataUnique(status_db_key, "-1");
+        LevelDB::getCsrDb()->deleteKey(csr_db_key);
+        string status_db_key = "CSR:HASH:" + hash + "STATUS:";
+        LevelDB::getCsrStatusDb()->deleteKey(status_db_key);
+        LevelDB::getCsrStatusDb()->writeDataUnique(status_db_key, "-1");
         throw RPCException(FAIL_TO_CREATE_CERTIFICATE, "CLIENT CERTIFICATE GENERATION FAILED");
         //exit(-1);
       }
     }
 
-    csrDb->deleteKey(csr_db_key);
-    std::string status_db_key = "CSR:HASH:" + hash + "STATUS:";
-    csrStatusDb->deleteKey(status_db_key);
-    csrStatusDb->writeDataUnique(status_db_key, std::to_string(status));
+    LevelDB::getCsrDb()->deleteKey(csr_db_key);
+    string status_db_key = "CSR:HASH:" + hash + "STATUS:";
+    LevelDB::getCsrStatusDb()->deleteKey(status_db_key);
+    LevelDB::getCsrStatusDb()->writeDataUnique(status_db_key, to_string(status));
 
     result["status"] = status;
 
   } catch (RPCException &_e) {
-    std::cerr << " err str " << _e.errString << std::endl;
+    cerr << " err str " << _e.errString << endl;
     result["status"] = _e.status;
     result["errorMessage"] = _e.errString;
   }
@@ -102,12 +102,12 @@ Json::Value SignByHashImpl(const std::string& hash, int status){
 
 
 Json::Value CSRManagerServer::GetUnsignedCSRs(){
-  std::lock_guard<std::recursive_mutex> lock(m);
+  lock_guard<recursive_mutex> lock(m);
   return GetUnsignedCSRsImpl();
 }
 
-Json::Value CSRManagerServer::SignByHash(const std::string& hash, int status){
-   std::lock_guard<std::recursive_mutex> lock(m);
+Json::Value CSRManagerServer::SignByHash(const string& hash, int status){
+   lock_guard<recursive_mutex> lock(m);
    return SignByHashImpl(hash, status);
 }
 

Dockerfile

@@ -8,7 +8,6 @@ COPY *.c ./
 COPY *.am ./
 COPY *.hpp ./
 COPY *.sh ./
-COPY *.m4 ./
 COPY *.gmp ./
 COPY *.ac ./
 COPY *.json ./

DockerfileSimulation

@@ -8,7 +8,6 @@ COPY *.c ./
 COPY *.am ./
 COPY *.hpp ./
 COPY *.sh ./
-COPY *.m4 ./
 COPY *.gmp ./
 COPY *.ac ./
 COPY *.json ./

LevelDB.cpp

@@ -37,24 +37,24 @@
 #include "ServerInit.h"
 
 #include "spdlog/spdlog.h"
+#include "common.h"
+
 
 using namespace leveldb;
 
 
+
 static WriteOptions writeOptions;
 static ReadOptions readOptions;
 
 
-LevelDB* levelDb = nullptr;
-LevelDB* csrDb = nullptr;
-LevelDB* csrStatusDb = nullptr;
 
 
-std::shared_ptr<std::string> LevelDB::readString(const std::string &_key) {
+std::shared_ptr<string> LevelDB::readString(const string &_key) {
 
     std::lock_guard<std::recursive_mutex> lock(mutex);
 
-    auto result = std::make_shared<std::string>();
+    auto result = std::make_shared<string>();
 
     if (db == nullptr) {
         throw RPCException(NULL_DATABASE, "Null db");
@@ -75,7 +75,7 @@ std::shared_ptr<std::string> LevelDB::readString(const std::string &_key) {
     return result;
 }
 
-void LevelDB::writeString(const std::string &_key, const std::string &_value) {
+void LevelDB::writeString(const string &_key, const string &_value) {
 
     std::lock_guard<std::recursive_mutex> lock(mutex);
 
@@ -90,11 +90,11 @@ void LevelDB::writeString(const std::string &_key, const std::string &_value) {
 }
 
 
-void LevelDB::deleteDHDKGKey (const std::string &_key) {
+void LevelDB::deleteDHDKGKey (const string &_key) {
 
     std::lock_guard<std::recursive_mutex> lock(mutex);
 
-    std::string full_key = "DKG_DH_KEY_" + _key;
+    string full_key = "DKG_DH_KEY_" + _key;
 
     auto status = db->Delete(writeOptions, Slice(_key));
 
@@ -106,11 +106,11 @@ void LevelDB::deleteDHDKGKey (const std::string &_key) {
     }
 }
 
-void LevelDB::deleteTempNEK(const std::string &_key){
+void LevelDB::deleteTempNEK(const string &_key){
 
     std::lock_guard<std::recursive_mutex> lock(mutex);
 
-    std::string prefix = _key.substr(0,8);
+    string prefix = _key.substr(0,8);
     if (prefix != "tmp_NEK:") {
       return;
     }
@@ -122,7 +122,7 @@ void LevelDB::deleteTempNEK(const std::string &_key){
     std::cerr << "key deleted " << _key << std::endl;
 }
 
-void LevelDB::deleteKey(const std::string &_key){
+void LevelDB::deleteKey(const string &_key){
 
     std::lock_guard<std::recursive_mutex> lock(mutex);
 
@@ -149,7 +149,7 @@ void LevelDB::writeByteArray(const char *_key, size_t _keyLen, const char *value
 }
 
 
-void LevelDB::writeByteArray(std::string &_key, const char *value,
+void LevelDB::writeByteArray(string &_key, const char *value,
                              size_t _valueLen) {
 
     std::lock_guard<std::recursive_mutex> lock(mutex);
@@ -188,13 +188,13 @@ uint64_t LevelDB::visitKeys(LevelDB::KeyVisitor *_visitor, uint64_t _maxKeysToVi
     return readCounter;
 }
 
-std::vector<std::string> LevelDB::writeKeysToVector1(uint64_t _maxKeysToVisit){
+std::vector<string> LevelDB::writeKeysToVector1(uint64_t _maxKeysToVisit){
   uint64_t readCounter = 0;
-  std::vector<std::string> keys;
+  std::vector<string> keys;
 
   leveldb::Iterator *it = db->NewIterator(readOptions);
   for (it->SeekToFirst(); it->Valid(); it->Next()) {
-    std::string cur_key(it->key().data(), it->key().size());
+    string cur_key(it->key().data(), it->key().size());
     keys.push_back(cur_key);
    // keys.push_back(it->key().data());
     readCounter++;
@@ -208,7 +208,7 @@ std::vector<std::string> LevelDB::writeKeysToVector1(uint64_t _maxKeysToVisit){
   return keys;
 }
 
-void LevelDB::writeDataUnique(const std::string & Name, const std::string &value) {
+void LevelDB::writeDataUnique(const string & Name, const string &value) {
 
   auto key = Name;
 
@@ -226,7 +226,7 @@ void LevelDB::writeDataUnique(const std::string & Name, const std::string &value
 }
 
 
-LevelDB::LevelDB(std::string &filename) {
+LevelDB::LevelDB(string &filename) {
 
 
     leveldb::Options options;
@@ -243,9 +243,73 @@ LevelDB::LevelDB(std::string &filename) {
 }
 
 LevelDB::~LevelDB() {
-    if (db != nullptr)
-        delete db;
 }
 
+const std::shared_ptr<LevelDB> &LevelDB::getLevelDb() {
+    CHECK_STATE(levelDb)
+    return levelDb;
+}
+
+const std::shared_ptr<LevelDB> &LevelDB::getCsrDb() {
+    CHECK_STATE(csrDb)
+    return csrDb;
+}
+
+const std::shared_ptr<LevelDB> &LevelDB::getCsrStatusDb() {
+    CHECK_STATE(csrStatusDb)
+    return csrStatusDb;
+}
+
+
+std::shared_ptr<LevelDB> LevelDB::levelDb = nullptr;
+
+std::shared_ptr<LevelDB> LevelDB::csrDb = nullptr;
+
+std::shared_ptr<LevelDB> LevelDB::csrStatusDb = nullptr;
+
+string LevelDB::sgx_data_folder;
+
+bool LevelDB::isInited = false;
+
+void LevelDB::initDataFolderAndDBs() {
+
+    if (isInited)
+        return;
+
+    char cwd[PATH_MAX];
+    if (getcwd(cwd, sizeof(cwd)) == NULL) {
+        spdlog::error("could not get cwd");
+        exit(-1);
+    }
+
 
+    sgx_data_folder = string(cwd) + "/" + SGXDATA_FOLDER;
+
+    struct stat info;
+    if (stat(sgx_data_folder.c_str(), &info) !=0 ){
+        spdlog::info("going to create sgx_data folder");
+        std::string make_sgx_data_folder = "mkdir " + sgx_data_folder;
+        if (system(make_sgx_data_folder.c_str()) == 0){
+            spdlog::info("sgx_data folder was created");
+        }
+        else{
+            spdlog::error("creating sgx_data folder failed");
+            exit(-1);
+        }
+    }
 
+
+    auto dbName = sgx_data_folder +  WALLETDB_NAME;
+    levelDb = make_shared<LevelDB>(dbName);
+
+    auto csr_dbname = sgx_data_folder + "CSR_DB";
+    csrDb = make_shared<LevelDB>(csr_dbname);
+
+    auto csr_status_dbname = sgx_data_folder + "CSR_STATUS_DB";
+    csrStatusDb = make_shared<LevelDB>(csr_status_dbname);
+
+}
+
+const string &LevelDB::getSgxDataFolder() {
+    return sgx_data_folder;
+}

LevelDB.h

@@ -29,7 +29,7 @@
 #include <string>
 #include <mutex>
 #include <vector>
-
+#include "common.h"
 namespace leveldb {
     class DB;
     class Status;
@@ -38,32 +38,54 @@ namespace leveldb {
 
 class LevelDB {
 
-    std::recursive_mutex mutex;
+    recursive_mutex mutex;
+
+    shared_ptr<leveldb::DB> db;
+
+    static bool isInited;
+
+    static shared_ptr<LevelDB> levelDb;
+
+    static shared_ptr<LevelDB> csrDb;
+
+    static shared_ptr<LevelDB> csrStatusDb;
+
+    static string sgx_data_folder;
+
 
-    leveldb::DB* db;
+public:
+
+
+    static void initDataFolderAndDBs();
+
+    static const shared_ptr<LevelDB> &getLevelDb();
+
+    static const shared_ptr<LevelDB> &getCsrDb();
+
+    static const shared_ptr<LevelDB> &getCsrStatusDb();
 
 public:
 
 
-    std::shared_ptr<std::string> readString(const std::string& _key);
+    shared_ptr<string> readString(const string& _key);
 
 
-    void writeString(const std::string &key1, const std::string &value1);
+    void writeString(const string &key1, const string &value1);
 
-    void writeDataUnique(const std::string & Name, const std::string &value);
+    void writeDataUnique(const string & Name, const string &value);
 
     void writeByteArray(const char *_key, size_t _keyLen, const char *value,
                         size_t _valueLen);
 
 
-    void writeByteArray(std::string& _key, const char *value,
+    void writeByteArray(string& _key, const char *value,
                         size_t _valueLen);
 
-    void deleteDHDKGKey (const std::string &_key);
+    void deleteDHDKGKey (const string &_key);
 
-    void deleteTempNEK (const std::string &_key);
+    void deleteTempNEK (const string &_key);
 
-    void deleteKey(const std::string &_key);
+    void deleteKey(const string &_key);
 
 public:
 
@@ -71,7 +93,7 @@ public:
     void throwExceptionOnError(leveldb::Status result);
 
 
-    LevelDB(std::string& filename);
+    LevelDB(string& filename);
 
 
 
@@ -79,23 +101,21 @@ public:
     class KeyVisitor {
     public:
         virtual void visitDBKey(const char* _data) = 0;
-        virtual void writeDBKeysToVector(const char* _data, std::vector<const char*> & keys_vect) {}
+        virtual void writeDBKeysToVector(const char* _data, vector<const char*> & keys_vect) {}
     };
 
     uint64_t visitKeys(KeyVisitor* _visitor, uint64_t _maxKeysToVisit);
 
-    std::vector<std::string> writeKeysToVector1(uint64_t _maxKeysToVisit);
+    vector<string> writeKeysToVector1(uint64_t _maxKeysToVisit);
 
     virtual ~LevelDB();
 
+    static const string &getSgxDataFolder();
 
-};
 
+};
 
-extern LevelDB* levelDb;
 
-extern LevelDB* csrDb;
 
-extern LevelDB* csrStatusDb;
 
 #endif
\ No newline at end of file

README.md

@@ -80,6 +80,7 @@ sudo docker-compose up
 
 Voila! You should see the "SGX Server started" message.
 
+
 ## Start, stop and upgrade sgxwallet
 
 As any docker-compose application sgxwallet is super easy to use. 
@@ -165,6 +166,7 @@ Reboot you machine after driver install.  Do `ls /dev/isgx` to check that `isgx`
 If you do not see the `isgx` device, you need to troubleshoot your driver installation.
 
 
+
 ## Run sgxwallet in secure SGX mode
 
 Run the latest sgxwallet docker container image in SGX mode
@@ -176,6 +178,10 @@ sudo docker-compose up -d
 
 You should see "SGX Server started message".
 
+Note: on some machines, the SGX device is not `/dev/mei0` but a different device, such 
+as "/dev/bs0". In this case please edit  `docker-compose.yml` on your machine to specify the correct 
+device to use. 
+
 # Development
 
 ## Install Prerequisites
@@ -229,6 +235,7 @@ Note: to run in simulation mode, add --enable-sgx-simulation flag when you run c
 Type:
 
 ```bash
+source sgx-sdk-build/sgxsdk/environment;
 ./sgxwallet
 ```
 

SEKManager.cpp

@@ -29,29 +29,28 @@
 #include <iostream>
 
 #include "sgxwallet_common.h"
+#include "common.h"
 #include "sgxwallet.h"
 
 void generate_SEK(){
 
-  char *errMsg = (char *)calloc(1024, 1);
+  vector<char> errMsg(1024,0);
   int err_status = 0;
-  uint8_t* encr_SEK = (uint8_t *)calloc(1024, 1);
+  vector<uint8_t> encr_SEK(1024, 0);
   uint32_t enc_len = 0;
 
-  status = generate_SEK(eid, &err_status, errMsg, encr_SEK, &enc_len);
+  status = generate_SEK(eid, &err_status, errMsg.data(), encr_SEK.data(), &enc_len);
   if ( err_status != 0 ){
-    std::cerr << "RPCException thrown" << std::endl;
-    throw RPCException(-666, errMsg) ;
+    cerr << "RPCException thrown" << endl;
+    throw RPCException(-666, errMsg.data()) ;
   }
 
-  char *hexEncrKey = (char *) calloc(2*enc_len + 1, 1);
-  carray2Hex(encr_SEK, enc_len, hexEncrKey);
+  vector<char> hexEncrKey(2*enc_len + 1, 0);
 
-  std::cerr << "key is " << errMsg << std::endl;
+  carray2Hex(encr_SEK.data(), enc_len, hexEncrKey.data());
 
-  levelDb->writeDataUnique("SEK", hexEncrKey);
+  cerr << "key is " << errMsg.data() << endl;
+
+  LevelDB::getLevelDb()->writeDataUnique("SEK", hexEncrKey.data());
 
-  free(errMsg);
-  free(encr_SEK);
-  free(hexEncrKey);
 }

SGXRegistrationServer.cpp

@@ -44,6 +44,7 @@
 #include "LevelDB.h"
 
 #include "spdlog/spdlog.h"
+#include "common.h"
 
 int DEBUG_PRINT = 0;
 int is_sgx_https = 1;
@@ -64,30 +65,30 @@ SGXRegistrationServer::SGXRegistrationServer(AbstractServerConnector &connector,
     : AbstractRegServer(connector, type), is_cert_created(false), cert_auto_sign(auto_sign) {}
 
 
-Json::Value SignCertificateImpl(const std::string& csr, bool auto_sign = false){
+Json::Value SignCertificateImpl(const string& csr, bool auto_sign = false){
   Json::Value result;
   result["status"] = 0;
   result["errorMessage"] = "";
   try{
     spdlog::info("enter SignCertificateImpl");
 
-    std::string status = "1";
-    std::string hash = cryptlite::sha256::hash_hex(csr);
+    string status = "1";
+    string hash = cryptlite::sha256::hash_hex(csr);
     if ( !auto_sign) {
-      std::string db_key = "CSR:HASH:" + hash;
-      csrDb->writeDataUnique(db_key, csr);
+      string db_key = "CSR:HASH:" + hash;
+      LevelDB::getCsrStatusDb()->writeDataUnique(db_key, csr);
     }
 
     if (auto_sign) {
-      std::string csr_name = "cert/" + hash + ".csr";
-      std::ofstream outfile(csr_name);
-      outfile << csr << std::endl;
+      string csr_name = "cert/" + hash + ".csr";
+      ofstream outfile(csr_name);
+      outfile << csr << endl;
       outfile.close();
       if (access(csr_name.c_str(), F_OK) != 0) {
         throw RPCException(FILE_NOT_FOUND, "Csr does not exist");
       }
 
-      std::string genCert = "cd cert && ./create_client_cert " + hash;
+      string genCert = "cd cert && ./create_client_cert " + hash;
 
       if (system(genCert.c_str()) == 0){
           spdlog::info("CLIENT CERTIFICATE IS SUCCESSFULLY GENERATED");
@@ -95,8 +96,8 @@ Json::Value SignCertificateImpl(const std::string& csr, bool auto_sign = false){
       }
       else{
           spdlog::info("CLIENT CERTIFICATE GENERATION FAILED");
-          std::string status_db_key = "CSR:HASH:" + hash + "STATUS:";
-          csrStatusDb->writeDataUnique(status_db_key, std::to_string(FAIL_TO_CREATE_CERTIFICATE));
+          string status_db_key = "CSR:HASH:" + hash + "STATUS:";
+          LevelDB::getCsrStatusDb()->writeDataUnique(status_db_key, to_string(FAIL_TO_CREATE_CERTIFICATE));
           throw RPCException(FAIL_TO_CREATE_CERTIFICATE, "CLIENT CERTIFICATE GENERATION FAILED");
           //exit(-1);
       }
@@ -105,11 +106,11 @@ Json::Value SignCertificateImpl(const std::string& csr, bool auto_sign = false){
     result["result"] = true;
     result["hash"] = hash;
 
-    std::string db_key = "CSR:HASH:" + hash + "STATUS:";
-    csrStatusDb->writeDataUnique(db_key, status);
+    string db_key = "CSR:HASH:" + hash + "STATUS:";
+    LevelDB::getCsrStatusDb()->writeDataUnique(db_key, status);
 
   } catch (RPCException &_e) {
-    std::cerr << " err str " << _e.errString << std::endl;
+    cerr << " err str " << _e.errString << endl;
     result["status"] = _e.status;
     result["errorMessage"] = _e.errString;
     result["result"] = false;
@@ -118,26 +119,26 @@ Json::Value SignCertificateImpl(const std::string& csr, bool auto_sign = false){
   return result;
 }
 
-Json::Value GetSertificateImpl(const std::string& hash){
+Json::Value GetSertificateImpl(const string& hash){
   Json::Value result;
 
-  std::string cert;
+  string cert;
   try{
-    std::string db_key = "CSR:HASH:" + hash + "STATUS:";
-    std::shared_ptr<string> status_str_ptr = csrStatusDb->readString(db_key);
+    string db_key = "CSR:HASH:" + hash + "STATUS:";
+    shared_ptr<string> status_str_ptr = LevelDB::getCsrStatusDb()->readString(db_key);
     if (status_str_ptr == nullptr){
        throw RPCException(KEY_SHARE_DOES_NOT_EXIST, "Data with this name does not exist in csr db");
     }
-    int status = std::atoi(status_str_ptr->c_str());
+    int status = atoi(status_str_ptr->c_str());
 
     if ( status == 0){
-      std::string crt_name = "cert/" + hash + ".crt";
+      string crt_name = "cert/" + hash + ".crt";
       //if (access(crt_name.c_str(), F_OK) == 0){
-        std::ifstream infile(crt_name);
+        ifstream infile(crt_name);
         if (!infile.is_open()) {
-          std::string status_db_key = "CSR:HASH:" + hash + "STATUS:";
-          csrStatusDb->deleteKey(status_db_key);
-          csrStatusDb->writeDataUnique(status_db_key, std::to_string(FILE_NOT_FOUND));
+          string status_db_key = "CSR:HASH:" + hash + "STATUS:";
+          LevelDB::getCsrStatusDb()->deleteKey(status_db_key);
+          LevelDB::getCsrStatusDb()->writeDataUnique(status_db_key, to_string(FILE_NOT_FOUND));
           throw RPCException(FILE_NOT_FOUND, "Certificate does not exist");
         } else {
           ostringstream ss;
@@ -145,9 +146,9 @@ Json::Value GetSertificateImpl(const std::string& hash){
           cert = ss.str();
 
           infile.close();
-          std::string remove_crt = "cd cert && rm -rf " + hash + ".crt && rm -rf " + hash + ".csr";
+          string remove_crt = "cd cert && rm -rf " + hash + ".crt && rm -rf " + hash + ".csr";
           if(system(remove_crt.c_str()) == 0){
-              //std::cerr << "cert removed" << std::endl;
+              //cerr << "cert removed" << endl;
               spdlog::info(" cert removed ");
 
           }
@@ -162,7 +163,7 @@ Json::Value GetSertificateImpl(const std::string& hash){
     result["cert"] = cert;
 
   } catch (RPCException &_e) {
-    std::cerr << " err str " << _e.errString << std::endl;
+    cerr << " err str " << _e.errString << endl;
     result["status"] = _e.status;
     result["errorMessage"] = _e.errString;
   }
@@ -171,13 +172,13 @@ Json::Value GetSertificateImpl(const std::string& hash){
 }
 
 
-Json::Value SGXRegistrationServer::SignCertificate(const std::string& csr){
+Json::Value SGXRegistrationServer::SignCertificate(const string& csr){
   spdlog::info("Enter SignCertificate ");
   lock_guard<recursive_mutex> lock(m);
   return SignCertificateImpl(csr, cert_auto_sign);
 }
 
-Json::Value SGXRegistrationServer::GetCertificate(const std::string& hash){
+Json::Value SGXRegistrationServer::GetCertificate(const string& hash){
   lock_guard<recursive_mutex> lock(m);
   return GetSertificateImpl(hash);
 }
@@ -191,19 +192,19 @@ void SGXRegistrationServer::set_cert_created(bool b){
 
 int init_registration_server(bool sign_automatically) {
 
-//  std::string certPath = "cert/SGXCACertificate.crt";
-//  std::string keyPath = "cert/SGXCACertificate.key";
+//  string certPath = "cert/SGXCACertificate.crt";
+//  string keyPath = "cert/SGXCACertificate.key";
 //
 //  if (access(certPath.c_str(), F_OK) != 0){
-//    std::cerr << "CERTIFICATE IS GOING TO BE CREATED" << std::endl;
+//    cerr << "CERTIFICATE IS GOING TO BE CREATED" << endl;
 //
-//    std::string genCert = "cd cert && ./self-signed-tls -c=US -s=California -l=San-Francisco -o=\"Skale Labs\" -u=\"Department of Software Engineering\" -n=\"SGXCACertificate\" -e=info@skalelabs.com";
+//    string genCert = "cd cert && ./self-signed-tls -c=US -s=California -l=San-Francisco -o=\"Skale Labs\" -u=\"Department of Software Engineering\" -n=\"SGXCACertificate\" -e=info@skalelabs.com";
 //
 //    if (system(genCert.c_str()) == 0){
-//      std::cerr << "CERTIFICATE IS SUCCESSFULLY GENERATED" << std::endl;
+//      cerr << "CERTIFICATE IS SUCCESSFULLY GENERATED" << endl;
 //    }
 //    else{
-//      std::cerr << "CERTIFICATE GENERATION FAILED" << std::endl;
+//      cerr << "CERTIFICATE GENERATION FAILED" << endl;
 //      exit(-1);
 //    }
 //  }

ServerDataChecker.cpp

@@ -28,14 +28,15 @@
 #include <iostream>
 
 #include "spdlog/spdlog.h"
+#include "common.h"
 
-std::vector<std::string> SplitString(const std::string& str, const std::string& delim = ":"){
-    std::vector<std::string> tokens;
+vector<string> SplitString(const string& str, const string& delim = ":"){
+    vector<string> tokens;
     size_t prev = 0, pos = 0;
     do {
         pos = str.find(delim, prev);
-        if (pos == std::string::npos) pos = str.length();
-        std::string token = str.substr(prev, pos-prev);
+        if (pos == string::npos) pos = str.length();
+        string token = str.substr(prev, pos-prev);
         if (!token.empty()) tokens.push_back(token);
         prev = pos + delim.length();
     } while (pos < str.length() && prev < str.length());
@@ -43,8 +44,8 @@ std::vector<std::string> SplitString(const std::string& str, const std::string&
     return tokens;
 }
 
-bool checkECDSAKeyName(const std::string& keyName) {
-  std::vector<std::string> parts = SplitString(keyName);
+bool checkECDSAKeyName(const string& keyName) {
+  vector<string> parts = SplitString(keyName);
   if (parts.size() != 2) {
     spdlog::info("ECDSAKeyName num parts != 2");
     return false;
@@ -69,7 +70,7 @@ bool checkECDSAKeyName(const std::string& keyName) {
   return true;
 }
 
-bool checkHex(const std::string& hex, const uint32_t sizeInBytes){
+bool checkHex(const string& hex, const uint32_t sizeInBytes){
   if ( hex.length() > sizeInBytes * 2 || hex.length() == 0){
     return false;
   }
@@ -86,8 +87,8 @@ bool checkHex(const std::string& hex, const uint32_t sizeInBytes){
   return true;
 }
 
-bool checkName (const std::string& Name, const std::string& prefix){
-    std::vector<std::string> parts = SplitString(Name);
+bool checkName (const string& Name, const string& prefix){
+    vector<string> parts = SplitString(Name);
     if ( parts.size() != 7) {
         spdlog::info("parts.size() != 7");
         return false;

ServerInit.cpp

@@ -72,37 +72,10 @@ void init_daemon() {
     libff::init_alt_bn128_params();
 
 
-    char cwd[PATH_MAX];
-    if (getcwd(cwd, sizeof(cwd)) == NULL) {
-        spdlog::error("could not get cwd");
-        exit(-1);
-    }
-
-
-    std::string sgx_data_folder = string(cwd) + "/" + SGXDATA_FOLDER;
-    struct stat info;
-    if (stat(sgx_data_folder.c_str(), &info) !=0 ){
-      spdlog::info("going to create sgx_data folder");
-      std::string make_sgx_data_folder = "mkdir " + sgx_data_folder;
-      if (system(make_sgx_data_folder.c_str()) == 0){
-        spdlog::info("sgx_data folder was created");
-      }
-      else{
-        spdlog::error("creating sgx_data folder failed");
-        exit(-1);
-      }
-    }
-
-    static std::string dbName = sgx_data_folder +  WALLETDB_NAME;
-    levelDb = new LevelDB(dbName);
-
-    static std::string csr_dbname = sgx_data_folder + "CSR_DB";
-    csrDb = new LevelDB(csr_dbname);
+    LevelDB::initDataFolderAndDBs();
 
-    static std::string csr_status_dbname = sgx_data_folder + "CSR_STATUS_DB";
-    csrStatusDb = new LevelDB(csr_status_dbname);
 
-    std::shared_ptr<std::string> encr_SEK_ptr = levelDb->readString("SEK");
+    std::shared_ptr<std::string> encr_SEK_ptr = LevelDB::getLevelDb()->readString("SEK");
     if (encr_SEK_ptr == nullptr){
       spdlog::info("SEK was not created yet");
       generate_SEK();
@@ -116,9 +89,10 @@ void init_enclave() {
     eid = 0;
     updated = 0;
 
-    unsigned long support;
+
 
 #ifndef SGX_HW_SIM
+    unsigned long support;
     support = get_sgx_support();
     if (!SGX_OK(support)) {
         sgx_support_perror(support);
@@ -170,8 +144,6 @@ void init_all(bool check_cert, bool sign_automatically) {
 
     sgxServerInited = 1;
 
-    init_daemon();
-
     if (is_sgx_https) {
       init_https_server(check_cert);
       init_registration_server(sign_automatically);

ServerInit.h

@@ -31,7 +31,6 @@
 #endif
 
 
-
 EXTERNC void init_all(bool check_cert, bool sign_automatically);
 
 EXTERNC void init_daemon();

common.h

+//
+// Created by kladko on 25.01.20.
+//
+
+#ifndef SGXWALLET_COMMON_H
+#define SGXWALLET_COMMON_H
+
+using namespace std;
+
+#include <stdlib.h>
+#include <iostream>
+#include <map>
+#include <memory>
+
+#define CHECK_ARGUMENT(_EXPRESSION_) \
+    if (!(_EXPRESSION_)) { \
+        auto __msg__ = string("Argument Check failed:") + #_EXPRESSION_ + "\n" + __CLASS_NAME__ + ":" + __FUNCTION__ +  \
+        + " " + string(__FILE__) + ":" + to_string(__LINE__); \
+        throw runtime_error(__msg__);}
+
+#define CHECK_STATE(_EXPRESSION_) \
+    if (!(_EXPRESSION_)) { \
+        auto __msg__ = string("State check failed::") + #_EXPRESSION_ +  " " + string(__FILE__) + ":" + to_string(__LINE__); \
+        throw runtime_error(__msg__);}
+
+#endif //SGXWALLET_COMMON_H

compile

-/usr/share/automake-1.16/compile
\ No newline at end of file

depcomp

-/usr/share/automake-1.16/depcomp
\ No newline at end of file

install-sh

-/usr/share/automake-1.16/install-sh
\ No newline at end of file

missing

-/usr/share/automake-1.16/missing
\ No newline at end of file

run_sgx_sim/docker-compose.yml

@@ -9,5 +9,5 @@ services:
     volumes:
       - ./sgx_data:/usr/src/sdk/sgx_data
     restart: unless-stopped
-    command: -s
+    command: -s -d 
 

scripts/docker_test.py

+#!/usr/bin/env python
+
+#
+#    @file  docker_test.py
+#    @author Stan Kladko
+#    @date 2020
+#
+
+import sys
+import os
+import subprocess
+import socket
+
+assert os.path.isdir('sgx_data/sgxwallet.db')
+assert os.path.isdir('sgx_data/cert_data');
+assert os.path.isdir('sgx_data/CSR_DB');
+assert os.path.isdir('sgx_data/CSR_STATUS_DB');
+assert os.path.isfile('sgx_data/cert_data/SGXServerCert.crt')
+assert os.path.isfile('sgx_data/cert_data/SGXServerCert.key')
+assert os.path.isfile('sgx_data/cert_data/rootCA.pem')
+assert os.path.isfile('sgx_data/cert_data/rootCA.key')
+
+s1 = socket.socket()
+s2 = socket.socket()
+s3 = socket.socket()
+address = '127.0.0.1'
+s1.connect((address, 1026))
+s2.connect((address, 1027))
+s3.connect((address, 1028))
+
+s1.close()
+s2.close()
+s3.close()
+
+
+
+
+
+
+

secure_enclave/Makefile.in

-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -137,16 +137,7 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/AESUtils.Po \
-	./$(DEPDIR)/BLSEnclave.Po ./$(DEPDIR)/DH_dkg.Po \
-	./$(DEPDIR)/DKGUtils.Po ./$(DEPDIR)/alt_bn128_g1.Po \
-	./$(DEPDIR)/alt_bn128_g2.Po ./$(DEPDIR)/alt_bn128_init.Po \
-	./$(DEPDIR)/curves.Po ./$(DEPDIR)/domain_parameters.Po \
-	./$(DEPDIR)/numbertheory.Po ./$(DEPDIR)/point.Po \
-	./$(DEPDIR)/secure_enclave.Po ./$(DEPDIR)/secure_enclave_t.Po \
-	./$(DEPDIR)/signature.Po ./$(DEPDIR)/signed_enclave_debug.Po \
-	./$(DEPDIR)/signed_enclave_rel.Po
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -375,8 +366,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/build-aux/sgx_enclave.am $(am__empty):
 
@@ -441,28 +432,22 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AESUtils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BLSEnclave.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DH_dkg.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DKGUtils.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g1.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g2.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_init.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curves.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/domain_parameters.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numbertheory.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/point.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave_t.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signature.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_debug.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_rel.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AESUtils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BLSEnclave.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DH_dkg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DKGUtils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_g2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alt_bn128_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curves.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/domain_parameters.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numbertheory.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/point.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_enclave_t.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signature.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_debug.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signed_enclave_rel.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -586,10 +571,7 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -662,22 +644,7 @@ clean: clean-am
 clean-am: clean-generic clean-libexecPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/AESUtils.Po
-	-rm -f ./$(DEPDIR)/BLSEnclave.Po
-	-rm -f ./$(DEPDIR)/DH_dkg.Po
-	-rm -f ./$(DEPDIR)/DKGUtils.Po
-	-rm -f ./$(DEPDIR)/alt_bn128_g1.Po
-	-rm -f ./$(DEPDIR)/alt_bn128_g2.Po
-	-rm -f ./$(DEPDIR)/alt_bn128_init.Po
-	-rm -f ./$(DEPDIR)/curves.Po
-	-rm -f ./$(DEPDIR)/domain_parameters.Po
-	-rm -f ./$(DEPDIR)/numbertheory.Po
-	-rm -f ./$(DEPDIR)/point.Po
-	-rm -f ./$(DEPDIR)/secure_enclave.Po
-	-rm -f ./$(DEPDIR)/secure_enclave_t.Po
-	-rm -f ./$(DEPDIR)/signature.Po
-	-rm -f ./$(DEPDIR)/signed_enclave_debug.Po
-	-rm -f ./$(DEPDIR)/signed_enclave_rel.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -723,22 +690,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/AESUtils.Po
-	-rm -f ./$(DEPDIR)/BLSEnclave.Po
-	-rm -f ./$(DEPDIR)/DH_dkg.Po
-	-rm -f ./$(DEPDIR)/DKGUtils.Po
-	-rm -f ./$(DEPDIR)/alt_bn128_g1.Po
-	-rm -f ./$(DEPDIR)/alt_bn128_g2.Po
-	-rm -f ./$(DEPDIR)/alt_bn128_init.Po
-	-rm -f ./$(DEPDIR)/curves.Po
-	-rm -f ./$(DEPDIR)/domain_parameters.Po
-	-rm -f ./$(DEPDIR)/numbertheory.Po
-	-rm -f ./$(DEPDIR)/point.Po
-	-rm -f ./$(DEPDIR)/secure_enclave.Po
-	-rm -f ./$(DEPDIR)/secure_enclave_t.Po
-	-rm -f ./$(DEPDIR)/signature.Po
-	-rm -f ./$(DEPDIR)/signed_enclave_debug.Po
-	-rm -f ./$(DEPDIR)/signed_enclave_rel.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -758,19 +710,19 @@ uninstall-am: uninstall-libexecPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-generic clean-libexecPROGRAMS cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-libexecPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libexecPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libexecPROGRAMS \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-libexecPROGRAMS
 
 .PRECIOUS: Makefile