OpenSSL: Check EVP_CIPHER_CTX_set_padding() return value more consistently

Even though this function is documented to always return 1, be more
consistent in checking that to avoid warnings from static analyzers.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2023-12-17 11:58:48 +02:00
parent 88bc6711a7
commit a92694b001

View file

@ -471,11 +471,11 @@ void * aes_encrypt_init(const u8 *key, size_t len)
ctx = EVP_CIPHER_CTX_new();
if (ctx == NULL)
return NULL;
if (EVP_EncryptInit_ex(ctx, type, NULL, key, NULL) != 1) {
if (EVP_EncryptInit_ex(ctx, type, NULL, key, NULL) != 1 ||
EVP_CIPHER_CTX_set_padding(ctx, 0) != 1) {
EVP_CIPHER_CTX_free(ctx);
return NULL;
}
EVP_CIPHER_CTX_set_padding(ctx, 0);
return ctx;
}
@ -528,11 +528,11 @@ void * aes_decrypt_init(const u8 *key, size_t len)
ctx = EVP_CIPHER_CTX_new();
if (ctx == NULL)
return NULL;
if (EVP_DecryptInit_ex(ctx, type, NULL, key, NULL) != 1) {
if (EVP_DecryptInit_ex(ctx, type, NULL, key, NULL) != 1 ||
EVP_CIPHER_CTX_set_padding(ctx, 0) != 1) {
EVP_CIPHER_CTX_free(ctx);
return NULL;
}
EVP_CIPHER_CTX_set_padding(ctx, 0);
return ctx;
}