51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From f004b4b7197fc83e7d47ec8cbcaefffa9a922717 Mon Sep 17 00:00:00 2001
|
|
From: Zdenek Styblik <stybla@turnovfree.net>
|
|
Date: Sun, 12 Mar 2017 14:00:35 +0100
|
|
Subject: [PATCH 017/119] ID:480 - ipmitool coredumps in EVP_CIPHER_CTX_init
|
|
|
|
IPMI tool coredumps due to changes introduced in ID:461. This shouldn't be
|
|
surprise as a NULL pointer is passed to init. Commit addresses this issue by
|
|
calling EVP_CIPHER_CTX_new() instead of EVP_CIPHER_CTX_init(), which is
|
|
deprecated, and by checking return value of call to former function.
|
|
---
|
|
src/plugins/lanplus/lanplus_crypt_impl.c | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
|
|
index bc130a0..f54bdda 100644
|
|
--- a/src/plugins/lanplus/lanplus_crypt_impl.c
|
|
+++ b/src/plugins/lanplus/lanplus_crypt_impl.c
|
|
@@ -164,8 +164,12 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
|
|
uint8_t * output,
|
|
uint32_t * bytes_written)
|
|
{
|
|
- EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
|
|
- EVP_CIPHER_CTX_init(ctx);
|
|
+ EVP_CIPHER_CTX *ctx = NULL;
|
|
+ ctx = EVP_CIPHER_CTX_new();
|
|
+ if (ctx == NULL) {
|
|
+ *bytes_written = 0;
|
|
+ return;
|
|
+ }
|
|
EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
|
EVP_CIPHER_CTX_set_padding(ctx, 0);
|
|
|
|
@@ -240,8 +244,12 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
|
|
uint8_t * output,
|
|
uint32_t * bytes_written)
|
|
{
|
|
- EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
|
|
- EVP_CIPHER_CTX_init(ctx);
|
|
+ EVP_CIPHER_CTX *ctx = NULL;
|
|
+ ctx = EVP_CIPHER_CTX_new();
|
|
+ if (ctx == NULL) {
|
|
+ *bytes_written = 0;
|
|
+ return;
|
|
+ }
|
|
EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
|
EVP_CIPHER_CTX_set_padding(ctx, 0);
|
|
|
|
--
|
|
2.19.1
|
|
|