SKALE-3660 remove semaphore

BLSCrypto.cpp

@@ -184,10 +184,8 @@ bool sign_aes(const char *_encryptedKeyHex, const char *_hashHex, size_t _t, siz
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedBlsSignMessage(eid, &errStatus, errMsg.data(), encryptedKey,
                                       sz, xStrArg, yStrArg, signature);
-    SEMAPHORE_END
 
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
@@ -226,10 +224,8 @@ string encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char *_key
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedEncryptKey(eid, errStatus, errMsg.data(), keyArray->data(), encryptedKey->data(),
                                &encryptedLen);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, *errStatus, errMsg.data());
 

BLSPrivateKeyShareSGX.cpp

@@ -149,10 +149,8 @@ string BLSPrivateKeyShareSGX::signWithHelperSGXstr(
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedBlsSignMessage(eid, &errStatus, errMsg.data(), encryptedKey,
                                       encryptedKeyHex->size() / 2, xStrArg, yStrArg, signature);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
 

DKGCrypto.cpp

@@ -136,11 +136,8 @@ string gen_dkg_poly(int _t) {
 
     sgx_status_t status = SGX_SUCCESS;
 
-
-    SEMAPHORE_BEGIN
-        status = trustedGenDkgSecret(
-                eid, &errStatus, errMsg.data(), encrypted_dkg_secret.data(), &enc_len, _t);
-    SEMAPHORE_END
+    status = trustedGenDkgSecret(eid, &errStatus, errMsg.data(), encrypted_dkg_secret.data(),
+                                 &enc_len, _t);
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
 
@@ -176,11 +173,8 @@ vector <vector<string>> get_verif_vect(const string &encryptedPolyHex, int t, in
 
     sgx_status_t status = SGX_SUCCESS;
 
-
-    SEMAPHORE_BEGIN
     status = trustedGetPublicShares(eid, &errStatus, errMsg.data(), encrDKGPoly.data(), encLen,
                                     pubShares.data(), t, n);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
 
@@ -369,10 +363,8 @@ verifyShares(const char *publicShares, const char *encr_sshare, const char *encr
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedDkgVerify(eid, &errStatus, errMsg.data(), pshares, encr_sshare, encr_key, decKeyLen, t,
                               ind, &result);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
 
@@ -406,10 +398,8 @@ verifySharesV2(const char *publicShares, const char *encr_sshare, const char *en
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedDkgVerifyV2(eid, &errStatus, errMsg.data(), pshares, encr_sshare, encr_key, decKeyLen, t,
                                 ind, &result);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
 
@@ -437,10 +427,8 @@ bool createBLSShare(const string &blsKeyName, const char *s_shares, const char *
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedCreateBlsKey(eid, &errStatus, errMsg.data(), s_shares, encr_key, decKeyLen, encr_bls_key,
                                  &enc_bls_len);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
 
@@ -471,9 +459,7 @@ vector <string> getBLSPubKey(const char *encryptedKeyHex) {
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedGetBlsPubKey(eid, &errStatus, errMsg1.data(), encrKey, decKeyLen, pubKey);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg1.data());
 
@@ -557,9 +543,8 @@ string decryptDHKey(const string &polyName, int ind) {
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedDecryptKey(eid, &errStatus, errMsg1.data(), encryptedDHKey, dhEncLen, DHKey);
-    SEMAPHORE_END
+
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg1.data())
 
     return DHKey;

ECDSACrypto.cpp

@@ -59,11 +59,9 @@ vector <string> genECDSAKey() {
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedGenerateEcdsaKey(eid, &errStatus,
                                errMsg.data(), encr_pr_key.data(), &enc_len,
                                pub_key_x.data(), pub_key_y.data());
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus,errMsg.data());
 
@@ -101,10 +99,8 @@ string getECDSAPubKey(const std::string& _encryptedKeyHex) {
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedGetPublicEcdsaKey(eid, &errStatus,
                                       errMsg.data(), encrPrKey.data(), enc_len, pubKeyX.data(), pubKeyY.data());
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data())
 
@@ -190,12 +186,10 @@ vector <string> ecdsaSignHash(const std::string& encryptedKeyHex, const char *ha
 
     sgx_status_t status = SGX_SUCCESS;
 
-    SEMAPHORE_BEGIN
     status = trustedEcdsaSign(eid, &errStatus,
                         errMsg.data(), encryptedKey.data(), decLen, hashHex,
                         signatureR.data(),
                         signatureS.data(), &signatureV, base);
-    SEMAPHORE_END
 
     HANDLE_TRUSTED_FUNCTION_ERROR(status, errStatus, errMsg.data());
 
@@ -242,10 +236,9 @@ string encryptECDSAKey(const string& _key) {
     uint64_t enc_len = 0;
 
     sgx_status_t status = SGX_SUCCESS;
-    SEMAPHORE_BEGIN
+
     status = trustedEncryptKey(eid, &errStatus, errString.data(), key.data(),
                                encryptedKey.data(), &enc_len);
-    SEMAPHORE_END
 
     if (status != 0) {
         throw SGXException(status, string("Could not encrypt ECDSA key: " + string(errString.begin(), errString.end())).c_str());

SGXWalletServer.cpp

@@ -57,10 +57,6 @@ using namespace std;
 
 std::shared_timed_mutex sgxInitMutex;
 
-// MAX 200 threads can call enclave
-boost::interprocess::interprocess_semaphore enclaveSemaphore(200);
-
-
 uint64_t initTime;
 
 void setFullOptions(uint64_t _logLevel, int _useHTTPS, int _autoconfirm, int _enterBackupKey) {
@@ -123,7 +119,7 @@ void SGXWalletServer::printDB() {
 #ifdef SGX_HW_SIM
 #define NUM_THREADS 16
 #else
-#define NUM_THREADS 1024
+#define NUM_THREADS 200
 #endif
 
 

sgxwallet_common.h

@@ -173,10 +173,5 @@ extern bool autoconfirm;
 #define TEST_VALUE "1234567890"
 
 
-#define SEMAPHORE_BEGIN { semaphore_guard __ENCLAVE__GUARD__(enclaveSemaphore) ;
-
-#define SEMAPHORE_END }
-
-
 
 #endif //SGXWALLET_SGXWALLET_COMMON_H