Merge pull request #53 from skalenetwork/SKALE-2167-tests

Skale 2167 tests

BLSCrypto.cpp

@@ -314,22 +314,21 @@ bool bls_sign(const char* _encryptedKeyHex, const char* _hashHex, size_t _t, siz
   }
 }
 
-char *encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key) {
-    char *keyArray = (char *) calloc(BUF_LEN, 1);
-    uint8_t *encryptedKey = (uint8_t *) calloc(BUF_LEN, 1);
-    char *errMsg = (char *) calloc(BUF_LEN, 1);
-    strncpy((char *) keyArray, (char *) _key, BUF_LEN);
-
+char* encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key) {
+    auto keyArray = make_shared<vector<char>>(BUF_LEN, 0);
+    auto encryptedKey = make_shared<vector<uint8_t>>(BUF_LEN, 0);
+    auto errMsg = make_shared<vector<char>>(BUF_LEN, 0);
+    strncpy(keyArray->data(), _key, BUF_LEN);
     *errStatus = -1;
 
     unsigned int encryptedLen = 0;
 
     //status = encrypt_key(eid, errStatus, errMsg, keyArray, encryptedKey, &encryptedLen);
-    status = encrypt_key_aes(eid, errStatus, errMsg, keyArray, encryptedKey, &encryptedLen);
+    status = encrypt_key_aes(eid, errStatus, errMsg->data(), keyArray->data(), encryptedKey->data(), &encryptedLen);
 
     if (DEBUG_PRINT) {
       spdlog::info("errStatus is {}",*errStatus);
-      spdlog::info(" errMsg is ", errMsg );
+      spdlog::info(" errMsg is ", errMsg->data() );
     }
 
     if (status != SGX_SUCCESS) {
@@ -339,13 +338,13 @@ char *encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key)
     }
 
     if (*errStatus != 0) {
-        throw RPCException(-666, errMsg);
+        throw RPCException(-666, errMsg->data());
     }
 
 
     char *result = (char *) calloc(2 * BUF_LEN, 1);
 
-    carray2Hex(encryptedKey, encryptedLen, result);
+    carray2Hex(encryptedKey->data(), encryptedLen, result);
 
     return result;
 }

BLSCrypto.h

@@ -49,8 +49,8 @@ EXTERNC bool hex2carray2(const char * _hex, uint64_t  *_bin_len,
 
 
 
-EXTERNC  char *encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key);
+char * encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key);
 
-EXTERNC char *decryptBLSKeyShareFromHex(int *errStatus, char *errMsg, const char *_encryptedKey);
+char *decryptBLSKeyShareFromHex(int *errStatus, char *errMsg, const char *_encryptedKey);
 
 #endif //SGXWALLET_BLSCRYPTO_H

DKGCrypto.cpp

@@ -146,7 +146,8 @@ vector <vector<string>> get_verif_vect(const char* encryptedPolyHex, int t, int
 //      printf(" %d ", encr_dkg_poly[i] );
   }
 
-  uint32_t len;
+  uint32_t len = 0;
+
   if (!is_aes)
     status = get_public_shares(eid, &err_status, errMsg1, encr_dkg_poly, len, public_shares, t, n);
   else {
@@ -170,7 +171,7 @@ vector <vector<string>> get_verif_vect(const char* encryptedPolyHex, int t, int
 
   vector <string> G2_strings = SplitString( public_shares, ',');
   vector <vector <string>> pub_shares_vect;
-  for ( int i = 0; i < G2_strings.size(); i++){
+  for ( uint64_t i = 0; i < G2_strings.size(); i++){
     vector <string> koef_str = SplitString(G2_strings.at(i).c_str(), ':');
     pub_shares_vect.push_back(koef_str);
   }
@@ -382,7 +383,6 @@ vector<string> GetBLSPubKey(const char * encryptedKeyHex){
     int err_status = 0;
 
     uint64_t dec_key_len ;
-    uint8_t encr_bls_key[BUF_LEN];
     uint8_t encr_key[BUF_LEN];
     if (!hex2carray(encryptedKeyHex, &dec_key_len, encr_key)){
         throw RPCException(INVALID_HEX, "Invalid encryptedKeyHex");

Dockerfile

@@ -7,7 +7,6 @@ COPY *.txt ./
 COPY *.c ./
 COPY *.am ./
 COPY *.hpp ./
-COPY *.sh ./
 COPY *.gmp ./
 COPY *.ac ./
 COPY *.json ./
@@ -34,6 +33,5 @@ RUN ./configure
 RUN make
 
 RUN mkdir /usr/src/sdk/sgx_data
-
 COPY docker/start.sh ./
 ENTRYPOINT ["/usr/src/sdk/start.sh"]

DockerfileSimulation

@@ -7,7 +7,6 @@ COPY *.txt ./
 COPY *.c ./
 COPY *.am ./
 COPY *.hpp ./
-COPY *.sh ./
 COPY *.gmp ./
 COPY *.ac ./
 COPY *.json ./
@@ -33,6 +32,7 @@ RUN make
 
 
 RUN mkdir /usr/src/sdk/sgx_data
+
 COPY docker/start.sh ./
 
-ENTRYPOINT ["/usr/src/sdk/start.sh"]
+ENTRYPOINT ["/usr/src/sdk/start.sh"]
\ No newline at end of file

Makefile.am

@@ -44,8 +44,10 @@ secure_enclave.edl: secure_enclave/secure_enclave.edl
 ##
 #AM_CPPFLAGS += -g -Og
 
-#AM_CFLAGS = -g -Og -rdynamic -Wl,--no-as-needed -lSegFault -fsanitize=address
-#AM_CXXFLAGS = ${AM_CPPFLAGS} -rdynamic -Wl,--no-as-needed -lSegFault -fsanitize=address
+
+AM_CFLAGS = -g -Og -rdynamic -Wl,--no-as-needed -lSegFault
+AM_CXXFLAGS = ${AM_CPPFLAGS} -rdynamic -Wl,--no-as-needed -lSegFault
+
 
 AM_CPPFLAGS += -Wall -DSKALE_SGX=1 -DBINARY_OUTPUT=1 -Ileveldb/include -IlibBLS/bls -IlibBLS/libff -IlibBLS -fno-builtin-memset $(GMP_CPPFLAGS)  -I.  -I./libBLS/deps/deps_inst/x86_or_x64/include
 

SEKManager.cpp

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

SGXWalletServer.cpp

@@ -152,11 +152,13 @@ importBLSKeyShareImpl(const string &_keyShare, const string &_keyShareName, int
     result["errorMessage"] = "";
     result["encryptedKeyShare"] = "";
 
+    char *encryptedKeyShareHex = nullptr;
+
     try {
 //        if ( !checkName(_keyShare, "BLS_KEY")){
 //          throw RPCException(INVALID_POLY_NAME, "Invalid BLSKey name");
 //        }
-        char *encryptedKeyShareHex = encryptBLSKeyShare2Hex(&errStatus, errMsg, _keyShare.c_str());
+        encryptedKeyShareHex = encryptBLSKeyShare2Hex(&errStatus, errMsg, _keyShare.c_str());
 
         if (encryptedKeyShareHex == nullptr) {
             throw RPCException(UNKNOWN_ERROR, "");
@@ -166,7 +168,7 @@ importBLSKeyShareImpl(const string &_keyShare, const string &_keyShareName, int
             throw RPCException(errStatus, errMsg);
         }
 
-        result["encryptedKeyShare"] = encryptedKeyShareHex;
+        result["encryptedKeyShare"] = string(encryptedKeyShareHex);
 
         writeKeyShare(_keyShareName, encryptedKeyShareHex, index, n , t);
 
@@ -175,6 +177,10 @@ importBLSKeyShareImpl(const string &_keyShare, const string &_keyShareName, int
         result["errorMessage"] = _e.errString;
     }
 
+    if (encryptedKeyShareHex != nullptr) {
+        free(encryptedKeyShareHex);
+    }
+
     return result;
 }
 
@@ -487,7 +493,7 @@ Json::Value getSecretShareImpl(const string& polyName, const Json::Value& public
     result["errorMessage"] = "";
 
     try {
-        if (publicKeys.size() != n){
+        if (publicKeys.size() != (uint64_t) n){
           throw RPCException(INVALID_DKG_PARAMS, "wrong number of public keys");
         }
         if ( !checkName(polyName, "POLY")){
@@ -543,7 +549,7 @@ Json::Value dkgVerificationImpl(const string& publicShares, const string& ethKey
     if ( !checkHex(SecretShare, SECRET_SHARE_NUM_BYTES)){
       throw RPCException(INVALID_HEX, "Invalid Secret share");
     }
-    if (publicShares.length() != 256 * t){
+    if (publicShares.length() != (uint64_t ) 256 * t){
       throw RPCException(INVALID_DKG_PARAMS, "Invalid length of public shares");
     }
 
@@ -573,7 +579,7 @@ Json::Value createBLSPrivateKeyImpl(const string & blsKeyName, const string& eth
 
   try {
 
-    if (SecretShare.length() != n * 192){
+    if (SecretShare.length() != (uint64_t ) n * 192){
       spdlog::info("wrong length of secret shares - {}", SecretShare.length());
       spdlog::info("secret shares - {}", SecretShare);
       throw RPCException(INVALID_SECRET_SHARES_LENGTH, "Invalid secret share length");

docker/start.sh

 #!/bin/bash
-
 source /opt/intel/sgxsdk/environment
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/sgxpsw/aesm/
-
-jhid -d
-/opt/intel/sgxpsw/aesm/aesm_service &
-pid=$!
+cd /usr/src/sdk;
 
-sleep 2
-cd /usr/src/sdk; ./sgxwallet $1 $2 $3 $4
+echo $1
+if [ "$1" = -t ]; then
+  set -e
+  ./testw [bls-key-encrypt]
+  ./testw [bls-key-encrypt-decrypt]
+  ./testw [dkg-gen]
+  ./testw [dkg-pub_shares]
+  ./testw [dkg-verify]
+  ./testw [ecdsa_test]
+  ./testw [test_test]
+  ./testw [get_pub_ecdsa_key_test]
+  ./testw [bls_dkg]
+  ./testw [api_test]
+  ./testw [getServerStatus_test]
+  ./testw [dkg_api_test]
+  ./testw [is_poly_test]
+  ./testw [AES-encrypt-decrypt]
+#./testw [ecdsa_api_test]
+#./testw [dkg-encr_sshares]
+# ./testw [bls_sign]
+#./testw [many_threads_test]
+#  ./testw [aes_dkg]
+else
+   ./sgxwallet $1 $2 $3 $4
+fi
 

run_sgx/docker-compose.yml

 version: '3'
 services:
   sgxwallet:
-    image: skalenetwork/sgxwallet:latest
+    image: skalenetwork/sgxwallet:latest_commit 
     ports:
       - "1026:1026"
       - "1027:1027"
@@ -17,6 +17,6 @@ services:
         max-size: "10m"
         max-file: "4"
     restart: unless-stopped
-    command: -s
+    command: -t
 
 

run_sgx_sim/docker-compose.yml

 version: '3'
 services:
   sgxwallet:
-    image: skalenetwork/sgxwalletsim:latest
+    image: skalenetwork/sgxwalletsim:latest_commit
     ports:
       - "1026:1026"
       - "1027:1027"
@@ -14,5 +14,5 @@ services:
         max-size: "10m"
         max-file: "4"
     restart: unless-stopped
-    command: -s -d -y 
+    command: -t  
 

scripts/docker_test.py

@@ -23,6 +23,12 @@
 #
 
 import sys, os, subprocess, socket, time
+
+
+
+
+
+
 os.chdir("..")
 topDir = os.getcwd() + "/sgxwallet"
 print("Starting build push")
@@ -44,13 +50,18 @@ print("Running tests for branch " + BRANCH);
 
 assert subprocess.call(["docker", "image", "inspect", FULL_IMAGE_NAME]) == 0;
 
-#assert subprocess.call(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data",
-#                        "-d", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX]) == 0
+completedProcess = subprocess.run(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-t",
+                        "--name", "sgxwallet", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-t"])
+
+print(completedProcess.stdout)
+print(completedProcess.stderr)
+assert completedProcess.returncode == 0;
 
-obj = subprocess.Popen(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-d","--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-y"], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-obj.communicate(input=b"i confirm", timeout=5)
-obj.terminate()
-obj.wait()
+
+assert subprocess.call(["docker", "rm", "sgxwallet"]) == 0
+assert subprocess.call(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-d",
+                        "--name", "sgxwallet",
+                    "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-y"]) == 0
 
 time.sleep(5);
 
@@ -74,9 +85,3 @@ 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
 

sgxwallet.c

@@ -73,11 +73,12 @@ int main(int argc, char *argv[]) {
     switch (opt) {
     case 'h':
       if (strlen(argv[1]) == 2 ) {
-        fprintf(stderr, "-c  client certificate will not be checked\n");
-        fprintf(stderr, "-s  client certificate will be signed automatically\n");
+        fprintf(stderr, "-c  do not verify client certificate\n");
+        fprintf(stderr, "-s  sign client certificate without human confirmation \n");
         fprintf(stderr, "-d  turn on debug output\n");
-        fprintf(stderr, "-0  SGXWalletServer will be launched on http (not https)\n");
-        fprintf(stderr, "-b  Enter backup key\n");
+        fprintf(stderr, "-0  launch SGXWalletServer using http (not https)\n");
+        fprintf(stderr, "-b  Restore from back up (you will need to enter backup key) \n");
+        fprintf(stderr, "-y  Do not ask user to acknoledge receipt of backup key \n");
         exit(0);
       } else {
         fprintf(stderr, "unknown flag %s\n", argv[1]);

stubclient.h

@@ -12,7 +12,7 @@ class StubClient : public jsonrpc::Client
     public:
         StubClient(jsonrpc::IClientConnector &conn, jsonrpc::clientVersion_t type = jsonrpc::JSONRPC_CLIENT_V2) : jsonrpc::Client(conn, type) {}
 
-        Json::Value importBLSKeyShare(const std::string& keyShare, const std::string& keyShareName, int t, int n, int index) throw (jsonrpc::JsonRpcException)
+        Json::Value importBLSKeyShare(const std::string& keyShare, const std::string& keyShareName, int t, int n, int index)
         {
             Json::Value p;
             p["index"] = index;
@@ -27,7 +27,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value blsSignMessageHash(const std::string& keyShareName, const std::string& messageHash, int t, int n, int signerIndex) throw (jsonrpc::JsonRpcException)
+        Json::Value blsSignMessageHash(const std::string& keyShareName, const std::string& messageHash, int t, int n, int signerIndex) 
         {
             Json::Value p;
             p["keyShareName"] = keyShareName;
@@ -42,7 +42,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value importECDSAKey(const std::string& key, const std::string& keyName) throw (jsonrpc::JsonRpcException)
+        Json::Value importECDSAKey(const std::string& key, const std::string& keyName) 
         {
             Json::Value p;
             p["key"] = key;
@@ -54,7 +54,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value generateECDSAKey() throw (jsonrpc::JsonRpcException)
+        Json::Value generateECDSAKey() 
         {
           Json::Value p;
           p = Json::nullValue;
@@ -65,7 +65,7 @@ class StubClient : public jsonrpc::Client
             throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value renameECDSAKey(const std::string& KeyName, const std::string& tempKeyName) throw (jsonrpc::JsonRpcException)
+        Json::Value renameECDSAKey(const std::string& KeyName, const std::string& tempKeyName) 
         {
           Json::Value p;
           p["keyName"] = KeyName;
@@ -77,7 +77,7 @@ class StubClient : public jsonrpc::Client
             throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value getPublicECDSAKey(const std::string& keyName) throw (jsonrpc::JsonRpcException)
+        Json::Value getPublicECDSAKey(const std::string& keyName) 
         {
             Json::Value p;
             p["keyName"] = keyName;
@@ -88,7 +88,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value ecdsaSignMessageHash(int base, const std::string& keyName, const std::string& messageHash) throw (jsonrpc::JsonRpcException)
+        Json::Value ecdsaSignMessageHash(int base, const std::string& keyName, const std::string& messageHash) 
         {
             Json::Value p;
             p["base"] = base;
@@ -101,7 +101,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value generateDKGPoly(const std::string& polyName, int t) throw (jsonrpc::JsonRpcException)
+        Json::Value generateDKGPoly(const std::string& polyName, int t) 
         {
             Json::Value p;
             p["polyName"] = polyName;
@@ -113,7 +113,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value getVerificationVector(const std::string& polyName, int t, int n) throw (jsonrpc::JsonRpcException)
+        Json::Value getVerificationVector(const std::string& polyName, int t, int n) 
         {
             Json::Value p;
             p["polyName"] = polyName;
@@ -126,7 +126,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value getSecretShare(const std::string& polyName, const Json::Value& publicKeys, int t, int n) throw (jsonrpc::JsonRpcException)
+        Json::Value getSecretShare(const std::string& polyName, const Json::Value& publicKeys, int t, int n) 
         {
             Json::Value p;
             p["polyName"] = polyName;
@@ -140,7 +140,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value dkgVerification(const std::string& publicShares, const std::string& ethKeyName, const std::string& SecretShare, int t, int n, int index) throw (jsonrpc::JsonRpcException)
+        Json::Value dkgVerification(const std::string& publicShares, const std::string& ethKeyName, const std::string& SecretShare, int t, int n, int index) 
         {
             Json::Value p;
             p["ethKeyName"] = ethKeyName;
@@ -156,7 +156,7 @@ class StubClient : public jsonrpc::Client
               throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value createBLSPrivateKey(const std::string & blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string& SecretShare, int t, int n) throw (jsonrpc::JsonRpcException)
+        Json::Value createBLSPrivateKey(const std::string & blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string& SecretShare, int t, int n) 
         {
           Json::Value p;
           p["blsKeyName"] = blsKeyName;
@@ -172,7 +172,7 @@ class StubClient : public jsonrpc::Client
            throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value getBLSPublicKeyShare(const std::string & blsKeyName) throw (jsonrpc::JsonRpcException)
+        Json::Value getBLSPublicKeyShare(const std::string & blsKeyName) 
         {
             Json::Value p;
             p["blsKeyName"] = blsKeyName;
@@ -184,7 +184,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value complaintResponse(const std::string& polyName, int ind) throw (jsonrpc::JsonRpcException)
+        Json::Value complaintResponse(const std::string& polyName, int ind) 
         {
           Json::Value p;
           p["polyName"] = polyName;
@@ -196,7 +196,7 @@ class StubClient : public jsonrpc::Client
             throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value multG2(const std::string & x) throw (jsonrpc::JsonRpcException)
+        Json::Value multG2(const std::string & x) 
         {
             Json::Value p;
             p["x"] = x;
@@ -208,7 +208,7 @@ class StubClient : public jsonrpc::Client
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
 
-        Json::Value isPolyExists(const std::string & polyName) throw (jsonrpc::JsonRpcException)
+        Json::Value isPolyExists(const std::string & polyName) 
         {
             Json::Value p;
             p["polyName"] = polyName;
@@ -223,7 +223,7 @@ class StubClient : public jsonrpc::Client
 
     ////CSRManagerServer
 
-  Json::Value getUnsignedCSRs() throw (jsonrpc::JsonRpcException)
+  Json::Value getUnsignedCSRs() 
   {
     Json::Value p;
     p = Json::nullValue;
@@ -236,7 +236,7 @@ class StubClient : public jsonrpc::Client
 
 
 
-    Json::Value signByHash(const std::string& hash, int status) throw (jsonrpc::JsonRpcException)
+    Json::Value signByHash(const std::string& hash, int status) 
     {
         Json::Value p;
         p["hash"] = hash;
@@ -249,7 +249,7 @@ class StubClient : public jsonrpc::Client
     }
 
 
-        Json::Value getServerStatus() throw (jsonrpc::JsonRpcException)
+        Json::Value getServerStatus() 
         {
             Json::Value p;
             p = Json::nullValue;

tests.bash

+#!/bin/bash
+set -e
+./testw [bls-key-encrypt]
+./testw [bls-key-encrypt-decrypt]
+./testw [dkg-gen]
+./testw [dkg-pub_shares]
+#./testw [dkg-encr_sshares]
+./testw [dkg-verify]
+./testw [ecdsa_test]
+./testw [test_test]
+./testw [get_pub_ecdsa_key_test]
+./testw [bls_dkg]
+./testw [api_test]
+./testw [getServerStatus_test]
+./testw [many_threads_test]
+./testw [ecdsa_api_test]
+./testw [dkg_api_test]
+./testw [is_poly_test]
+./testw [aes_dkg]
+#./testw [bls_sign]
+./testw [AES-encrypt-decrypt]
+