Merge pull request #412 from skalenetwork/beta-to-develop

DmytroNazarenko · web-flow · commit c9928fcfb42d · 2023-03-23T16:16:53.000Z
Beta to develop
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.9.0
+1.9.0
diff --git a/secure_enclave/AESUtils.c b/secure_enclave/AESUtils.c
@@ -107,6 +107,10 @@ int AES_decrypt(uint8_t *encrMessage, uint64_t length, char *message, uint64_t m
         return -4;
     }
 
+    if (length < SGX_AESGCM_MAC_SIZE + SGX_AESGCM_IV_SIZE) {
+        LOG_ERROR("length < SGX_AESGCM_MAC_SIZE - SGX_AESGCM_IV_SIZE");
+        return -5;
+    }
 
     if (length < SGX_AESGCM_MAC_SIZE + SGX_AESGCM_IV_SIZE) {
         LOG_ERROR("length < SGX_AESGCM_MAC_SIZE - SGX_AESGCM_IV_SIZE");
diff --git a/secure_enclave/secure_enclave.c b/secure_enclave/secure_enclave.c
@@ -600,7 +600,6 @@ void trustedEcdsaSign(int *errStatus, char *errString, uint8_t *encryptedPrivate
 
 void trustedDecryptKey(int *errStatus, char *errString, uint8_t *encryptedPrivateKey,
                           uint64_t enc_len, char *key) {
-
     LOG_DEBUG(__FUNCTION__);
     INIT_ERROR_STATE
 

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,10 @@ int AES_decrypt(uint8_t encrMessage, uint64_t length, char message, uint64_t m`
`107`	`107`	`return -4;`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ if (length < SGX_AESGCM_MAC_SIZE + SGX_AESGCM_IV_SIZE) {`
	`111`	`+ LOG_ERROR("length < SGX_AESGCM_MAC_SIZE - SGX_AESGCM_IV_SIZE");`
	`112`	`+ return -5;`
	`113`	`+ }`
`110`	`114`
`111`	`115`	`if (length < SGX_AESGCM_MAC_SIZE + SGX_AESGCM_IV_SIZE) {`
`112`	`116`	`LOG_ERROR("length < SGX_AESGCM_MAC_SIZE - SGX_AESGCM_IV_SIZE");`