1*4882a593SmuzhiyunFrom fc2136969adfb926eed610b8ed0a74b2030b48ed Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Rosen Penev <rosenp@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 21 Aug 2018 19:29:07 -0700 4*4882a593SmuzhiyunSubject: [PATCH] lanplus: Fix compile with deprecated APIs disabled. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFrom the man page: 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunEVP_CIPHER_CTX was made opaque in OpenSSL 1.1.0. As a result, 9*4882a593SmuzhiyunEVP_CIPHER_CTX_reset() appeared and EVP_CIPHER_CTX_cleanup() disappeared. 10*4882a593SmuzhiyunEVP_CIPHER_CTX_init() remains as an alias for EVP_CIPHER_CTX_reset(). 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunUpstream: https://github.com/ipmitool/ipmitool/commit/a8862d7508fb138b1c286eea958700cca63c9476 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Rosen Penev <rosenp@gmail.com> 15*4882a593SmuzhiyunSigned-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++ 18*4882a593Smuzhiyun 1 file changed, 8 insertions(+) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c 21*4882a593Smuzhiyunindex 9652a5e..e94401e 100644 22*4882a593Smuzhiyun--- a/src/plugins/lanplus/lanplus_crypt_impl.c 23*4882a593Smuzhiyun+++ b/src/plugins/lanplus/lanplus_crypt_impl.c 24*4882a593Smuzhiyun@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, 25*4882a593Smuzhiyun lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); 26*4882a593Smuzhiyun return; 27*4882a593Smuzhiyun } 28*4882a593Smuzhiyun+#if OPENSSL_VERSION_NUMBER < 0x10100000L 29*4882a593Smuzhiyun EVP_CIPHER_CTX_init(ctx); 30*4882a593Smuzhiyun+#else 31*4882a593Smuzhiyun+ EVP_CIPHER_CTX_reset(ctx); 32*4882a593Smuzhiyun+#endif 33*4882a593Smuzhiyun EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); 34*4882a593Smuzhiyun EVP_CIPHER_CTX_set_padding(ctx, 0); 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, 37*4882a593Smuzhiyun lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); 38*4882a593Smuzhiyun return; 39*4882a593Smuzhiyun } 40*4882a593Smuzhiyun+#if OPENSSL_VERSION_NUMBER < 0x10100000L 41*4882a593Smuzhiyun EVP_CIPHER_CTX_init(ctx); 42*4882a593Smuzhiyun+#else 43*4882a593Smuzhiyun+ EVP_CIPHER_CTX_reset(ctx); 44*4882a593Smuzhiyun+#endif 45*4882a593Smuzhiyun EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); 46*4882a593Smuzhiyun EVP_CIPHER_CTX_set_padding(ctx, 0); 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun-- 49*4882a593Smuzhiyun1.9.1 50*4882a593Smuzhiyun 51