Merge pull request #99 from skalenetwork/bug/SKALE-2686-server-stuck-…

…with-n-flag Bug/skale 2686 server stuck with n flag
skalenetwork · Jun 4, 2020 · 5d159a1 · 5d159a1
2 parents 853981a + 523ed1b
commit 5d159a1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 14 deletions.
diff --git a/ECDSACrypto.cpp b/ECDSACrypto.cpp
@@ -144,7 +144,6 @@ string getECDSAPubKey(const char *_encryptedKeyHex) {
 
 bool verifyECDSASig(string& pubKeyStr, const char *hashHex, const char *signatureR,
         const char *signatureS) {
-
     bool result = false;
 
     signature sig = signature_init();
@@ -158,8 +157,6 @@ bool verifyECDSASig(string& pubKeyStr, const char *hashHex, const char *signatur
 
     mpz_t msgMpz;
     mpz_init(msgMpz);
-
-
     if (mpz_set_str(msgMpz, hashHex, 16) == -1) {
         spdlog::error("invalid message hash {}", hashHex);
         goto clean;

diff --git a/SEKManager.cpp b/SEKManager.cpp
@@ -123,7 +123,6 @@ bool check_SEK(std::string SEK){
 }
 
 void gen_SEK(){
-
   vector<char> errMsg(1024,0);
   int err_status = 0;
   vector<uint8_t> encr_SEK(1024, 0);

diff --git a/SGXWalletServer.cpp b/SGXWalletServer.cpp
@@ -53,8 +53,11 @@ void setFullOptions(int _printDebugInfo,
         spdlog::set_level(spdlog::level::info);
     }
     useHTTPS = _useHTTPS;
+    spdlog::info("useHTTPS set to " + std::to_string(_useHTTPS));
     autoconfirm = _autoconfirm;
+    spdlog::info("autoconfirm set to " + std::to_string(autoconfirm));
     encryptKeys = _encryptKeys;
+    spdlog::info("encryptKeys set to " + std::to_string(encryptKeys));
 }
 
 

diff --git a/run_sgx/docker-compose.yml b/run_sgx/docker-compose.yml
@@ -6,6 +6,7 @@ services:
       - "1026:1026"
       - "1027:1027"
       - "1028:1028"
+      - "1029:1029"
     devices:
       - "/dev/isgx"
       - "/dev/mei0"

diff --git a/run_sgx_sim/docker-compose.yml b/run_sgx_sim/docker-compose.yml
@@ -6,6 +6,7 @@ services:
       - "1026:1026"
       - "1027:1027"
       - "1028:1028"
+      - "1029:1029"
     volumes:
       - ./sgx_data:/usr/src/sdk/sgx_data
       -  /dev/urandom:/dev/random

diff --git a/scripts/build_deps.py b/scripts/build_deps.py
@@ -46,8 +46,6 @@
 BLS_BUILD_DIR = BLS_DIR + "/build"
 JSON_LIBS_DIR = topDir +  "/jsonrpc"
 
-#subprocess.call(["git", "submodule",  "update", "--init"])
-
 print("Cleaning")
 
 subprocess.call(["rm", "-f",  "install-sh"])

diff --git a/scripts/calculate_version.sh b/scripts/calculate_version.sh
@@ -34,14 +34,9 @@ fi
 
 for (( VERSION_NUMBER=0; ; VERSION_NUMBER++ ))
 do
-    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" -lt 4 ]
-    then
-        VERSION_NUMBER=4
-    fi
     RESULT_VERSION="$VERSION-$LABEL.$VERSION_NUMBER"
-    if ! [ $(git tag -l ?$RESULT_VERSION) ]
-    then
-        echo "$RESULT_VERSION"
+    if ! [[ $(git tag -l | grep $RESULT_VERSION) ]]; then
+        echo "$RESULT_VERSION" | tr / -
         break
     fi
 done
diff --git a/sgxwallet.c b/sgxwallet.c
@@ -132,7 +132,7 @@ int main(int argc, char *argv[]) {
 
     setFullOptions(printDebugInfoOption, printTraceInfoOption, useHTTPSOption, autoconfirmOption, encryptKeysOption);
 
-    uint32_t  enclaveLogLevel = L_INFO;
+    uint32_t enclaveLogLevel = L_INFO;
 
     if (printTraceInfoOption) {
         enclaveLogLevel = L_TRACE;