openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-23 16:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!5909 feat: Clear the warning

Browse Source 
Merge pull request !5909 from xingchu/master
This commit is contained in:
openharmony_ci 2024-04-30 09:36:18 +00:00 committed by Gitee
commit aa088d2489
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
adapter/common/openssl/softbus_adapter_crypto.c
View File

@ -180,7 +180,7 @@ static int32_t SslAesGcmDecrypt(const AesGcmCipherKey *cipherkey, const unsigned
return SOFTBUS_INVALID_PARAM; return SOFTBUS_INVALID_PARAM;
} }
int32_t outlen = 0; int32_t outLen = 0;
EVP_CIPHER_CTX *ctx = NULL; EVP_CIPHER_CTX *ctx = NULL;
int32_t ret = OpensslEvpInit(&ctx, cipherkey, false); int32_t ret = OpensslEvpInit(&ctx, cipherkey, false);
if (ret != SOFTBUS_OK) { if (ret != SOFTBUS_OK) {
@ -190,31 +190,38 @@ static int32_t SslAesGcmDecrypt(const AesGcmCipherKey *cipherkey, const unsigned
ret = EVP_DecryptInit_ex(ctx, NULL, NULL, cipherkey->key, cipherkey->iv); ret = EVP_DecryptInit_ex(ctx, NULL, NULL, cipherkey->key, cipherkey->iv);
if (ret != 1) { if (ret != 1) {
COMM_LOGE(COMM_ADAPTER, "EVP_EncryptInit_ex fail."); COMM_LOGE(COMM_ADAPTER, "EVP_EncryptInit_ex fail.");
EVP_CIPHER_CTX_free(ctx); goto EXIT;
return SOFTBUS_DECRYPT_ERR;
} }
ret = EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, TAG_LEN, (void *)(cipherText + (cipherTextSize - TAG_LEN))); ret = EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, TAG_LEN, (void *)(cipherText + (cipherTextSize - TAG_LEN)));
if (ret != 1) { if (ret != 1) {
COMM_LOGE(COMM_ADAPTER, "EVP_DecryptUpdate fail."); COMM_LOGE(COMM_ADAPTER, "EVP_DecryptUpdate fail.");
EVP_CIPHER_CTX_free(ctx); goto EXIT;
return SOFTBUS_DECRYPT_ERR;
} }
ret = EVP_DecryptUpdate(ctx, plain, (int32_t *)&plainLen, cipherText + GCM_IV_LEN, cipherTextSize - OVERHEAD_LEN); ret = EVP_DecryptUpdate(ctx, plain, (int32_t *)&plainLen, cipherText + GCM_IV_LEN, cipherTextSize - OVERHEAD_LEN);
if (ret != 1) { if (ret != 1) {
COMM_LOGE(COMM_ADAPTER, "EVP_DecryptUpdate fail."); COMM_LOGE(COMM_ADAPTER, "EVP_DecryptUpdate fail.");
EVP_CIPHER_CTX_free(ctx); goto EXIT;
return SOFTBUS_DECRYPT_ERR;
} }
outlen += plainLen; if (plainLen > INT32_MAX) {
COMM_LOGE(COMM_ADAPTER, "PlainLen convert overflow.");
goto EXIT;
}
outLen += (int32_t)plainLen;
ret = EVP_DecryptFinal_ex(ctx, plain + plainLen, (int32_t *)&plainLen); ret = EVP_DecryptFinal_ex(ctx, plain + plainLen, (int32_t *)&plainLen);
if (ret != 1) { if (ret != 1) {
COMM_LOGE(COMM_ADAPTER, "EVP_DecryptFinal_ex fail."); COMM_LOGE(COMM_ADAPTER, "EVP_DecryptFinal_ex fail.");
EVP_CIPHER_CTX_free(ctx); goto EXIT;
return SOFTBUS_DECRYPT_ERR;
} }
outlen += plainLen; if (plainLen > INT32_MAX - outLen) {
COMM_LOGE(COMM_ADAPTER, "outLen convert overflow.");
goto EXIT;
}
outLen += (int32_t)plainLen;
EVP_CIPHER_CTX_free(ctx); EVP_CIPHER_CTX_free(ctx);
return outlen; return outLen;
EXIT:
EVP_CIPHER_CTX_free(ctx);
return SOFTBUS_DECRYPT_ERR;
} }
static int32_t HandleError(EVP_CIPHER_CTX *ctx, const char *buf) static int32_t HandleError(EVP_CIPHER_CTX *ctx, const char *buf)