diff --git a/0002-openssl.patch b/0002-openssl.patch index a3ded98..ff5e705 100644 --- a/0002-openssl.patch +++ b/0002-openssl.patch @@ -1,6 +1,6 @@ diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/lanplus_crypt_impl.c --- old/src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200 -+++ new/src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 09:03:15.498930188 +0100 ++++ new/src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100 @@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_ uint8_t * output, uint32_t * bytes_written) @@ -9,7 +9,7 @@ diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/ - EVP_CIPHER_CTX_init(&ctx); - EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX *ctx; ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); + EVP_CIPHER_CTX_init(ctx); + EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); + EVP_CIPHER_CTX_set_padding(ctx, 0); @@ -34,16 +34,17 @@ diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/ { *bytes_written = 0; return; /* Error */ -@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ +@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_ { /* Success */ *bytes_written += tmplen; - EVP_CIPHER_CTX_cleanup(&ctx); + EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); } } } -@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_ +@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_ uint8_t * output, uint32_t * bytes_written) { @@ -51,14 +52,14 @@ diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/ - EVP_CIPHER_CTX_init(&ctx); - EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX *ctx; ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); + EVP_CIPHER_CTX_init(ctx); + EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); + EVP_CIPHER_CTX_set_padding(ctx, 0); if (verbose >= 5) -@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ +@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); @@ -67,7 +68,7 @@ diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/ { /* Error */ lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); -@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ +@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ { uint32_t tmplen; @@ -76,12 +77,13 @@ diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/ { char buffer[1000]; ERR_error_string(ERR_get_error(), buffer); -@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ +@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_ { /* Success */ *bytes_written += tmplen; - EVP_CIPHER_CTX_cleanup(&ctx); + EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); } } diff --git a/ipmitool.spec b/ipmitool.spec index 2073087..855ae8e 100644 --- a/ipmitool.spec +++ b/ipmitool.spec @@ -1,7 +1,7 @@ Name: ipmitool Summary: Utility for IPMI control Version: 1.8.18 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Base URL: http://ipmitool.sourceforge.net/ @@ -178,6 +178,9 @@ install -Dm 755 contrib/bmc-snmp-proxy %{buildroot}%{_libexecdir}/bmc-sn %{_libexecdir}/bmc-snmp-proxy %changelog +* Tue Feb 21 2017 Josef Ridky - 1.8.18-5 +- Fix allocation issue + * Tue Feb 21 2017 Josef Ridky - 1.8.18-4 - Add support for OpenSSL-1.1.0 library (#1423743)