diff options
| author | Matt Weber <matthew.weber@rockwellcollins.com> | 2019-02-05 08:37:09 -0600 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-02-05 18:09:01 +0100 |
| commit | cbbeda002317bd187768da6da011730e44f6349e (patch) | |
| tree | 68c71a089fa052b0ef6b6de57c4c7a5a77a8a2cf /package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch | |
| parent | fb26b85b90bd84af38f54fa5464d30cedd4967af (diff) | |
| download | buildroot-cbbeda002317bd187768da6da011730e44f6349e.tar.gz buildroot-cbbeda002317bd187768da6da011730e44f6349e.zip | |
package/ipmitool: add openssl 1.1.x compatibility
Changes adapt the current codebase to use supported APIs now that openssl
1.1.x by default disables all deprecated items.
Fixes
http://autobuild.buildroot.net/results/97d/97dab568f1f3d342b6bfcb9f597ced4de6f1309e
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch')
| -rw-r--r-- | package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch b/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch new file mode 100644 index 0000000000..87fdd0aaf7 --- /dev/null +++ b/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch @@ -0,0 +1,50 @@ +From fc2136969adfb926eed610b8ed0a74b2030b48ed Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Tue, 21 Aug 2018 19:29:07 -0700 +Subject: [PATCH] lanplus: Fix compile with deprecated APIs disabled. + +From the man page: + +EVP_CIPHER_CTX was made opaque in OpenSSL 1.1.0. As a result, +EVP_CIPHER_CTX_reset() appeared and EVP_CIPHER_CTX_cleanup() disappeared. +EVP_CIPHER_CTX_init() remains as an alias for EVP_CIPHER_CTX_reset(). + +Upstream: https://github.com/ipmitool/ipmitool/commit/a8862d7508fb138b1c286eea958700cca63c9476 + +Signed-off-by: Rosen Penev <rosenp@gmail.com> +Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> +--- + src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c +index 9652a5e..e94401e 100644 +--- a/src/plugins/lanplus/lanplus_crypt_impl.c ++++ b/src/plugins/lanplus/lanplus_crypt_impl.c +@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, + lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); + return; + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_CIPHER_CTX_init(ctx); ++#else ++ EVP_CIPHER_CTX_reset(ctx); ++#endif + EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); + EVP_CIPHER_CTX_set_padding(ctx, 0); + +@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, + lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); + return; + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_CIPHER_CTX_init(ctx); ++#else ++ EVP_CIPHER_CTX_reset(ctx); ++#endif + EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); + EVP_CIPHER_CTX_set_padding(ctx, 0); + +-- +1.9.1 + |
