Unverified Commit a4382dc4 authored by Oleh Nikolaiev's avatar Oleh Nikolaiev Committed by GitHub

Merge pull request #154 from skalenetwork/bug/SKALE-3114-bls-sign-error

SKALE-3114 fix bls import/sign error
parents 89a991a7 d294b111
...@@ -248,11 +248,7 @@ std::string encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char ...@@ -248,11 +248,7 @@ std::string encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char
auto encryptedKey = make_shared<vector<uint8_t>>(BUF_LEN, 0); auto encryptedKey = make_shared<vector<uint8_t>>(BUF_LEN, 0);
auto errMsg = make_shared<vector<char>>(BUF_LEN, 0); auto errMsg = make_shared<vector<char>>(BUF_LEN, 0);
libff::alt_bn128_Fr key(_key); strncpy(keyArray->data(), _key, BUF_LEN);
string str_key = BLSutils::ConvertToString(key);
strncpy(keyArray->data(), str_key.data(), BUF_LEN);
*errStatus = -1; *errStatus = -1;
unsigned int encryptedLen = 0; unsigned int encryptedLen = 0;
...@@ -268,7 +264,7 @@ std::string encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char ...@@ -268,7 +264,7 @@ std::string encryptBLSKeyShare2Hex(int *errStatus, char *err_string, const char
if (status != SGX_SUCCESS) { if (status != SGX_SUCCESS) {
*errStatus = -1; *errStatus = -1;
return nullptr; return "";
} }
std::string result(2 * BUF_LEN, '\0'); std::string result(2 * BUF_LEN, '\0');
......
...@@ -16,5 +16,4 @@ services: ...@@ -16,5 +16,4 @@ services:
max-size: "10m" max-size: "10m"
max-file: "4" max-file: "4"
restart: unless-stopped restart: unless-stopped
command: -s command: -s -y
...@@ -145,8 +145,10 @@ libff::alt_bn128_Fr *keyFromString(const char *_keyStringHex) { ...@@ -145,8 +145,10 @@ libff::alt_bn128_Fr *keyFromString(const char *_keyStringHex) {
SAFE_CHAR_BUF(skey_dec, BUF_LEN); SAFE_CHAR_BUF(skey_dec, BUF_LEN);
libff::alt_bn128_Fr *ret = nullptr; libff::alt_bn128_Fr *ret = nullptr;
if (mpz_set_str(skey, _keyStringHex, 16) == -1) {
goto clean;
}
mpz_set_str(skey, _keyStringHex, 16);
mpz_get_str(skey_dec, 10, skey); mpz_get_str(skey_dec, 10, skey);
ret = new libff::alt_bn128_Fr(skey_dec); ret = new libff::alt_bn128_Fr(skey_dec);
......
...@@ -668,7 +668,12 @@ void trustedBlsSignMessageAES(int *errStatus, char *errString, uint8_t *encrypte ...@@ -668,7 +668,12 @@ void trustedBlsSignMessageAES(int *errStatus, char *errString, uint8_t *encrypte
CHECK_STATUS("AES decrypt failed") CHECK_STATUS("AES decrypt failed")
enclave_sign(key, _hashX, _hashY, sig); if (!enclave_sign(key, _hashX, _hashY, sig)) {
strncpy(errString, "Enclave failed to create bls signature", BUF_LEN);
LOG_ERROR(errString);
*errStatus = -1;
goto clean;
}
strncpy(signature, sig, BUF_LEN); strncpy(signature, sig, BUF_LEN);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment