You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

42 lines
1.4 KiB

  1. From cf39da53236abf02d39c6a98a645488933f3e861 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Tue, 21 Aug 2018 19:29:07 -0700
  4. Subject: [PATCH] ipmitool: Fix compile with deprecated APIs disabled.
  5. From the man page:
  6. EVP_CIPHER_CTX was made opaque in OpenSSL 1.1.0. As a result,
  7. EVP_CIPHER_CTX_reset() appeared and EVP_CIPHER_CTX_cleanup() disappeared.
  8. EVP_CIPHER_CTX_init() remains as an alias for EVP_CIPHER_CTX_reset().
  9. Signed-off-by: Rosen Penev <rosenp@gmail.com>
  10. ---
  11. src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++
  12. 1 file changed, 8 insertions(+)
  13. --- a/src/plugins/lanplus/lanplus_crypt_impl.c
  14. +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
  15. @@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  16. lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
  17. return;
  18. }
  19. +#if OPENSSL_VERSION_NUMBER < 0x10100000L
  20. EVP_CIPHER_CTX_init(ctx);
  21. +#else
  22. + EVP_CIPHER_CTX_reset(ctx);
  23. +#endif
  24. EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
  25. EVP_CIPHER_CTX_set_padding(ctx, 0);
  26. @@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  27. lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
  28. return;
  29. }
  30. +#if OPENSSL_VERSION_NUMBER < 0x10100000L
  31. EVP_CIPHER_CTX_init(ctx);
  32. +#else
  33. + EVP_CIPHER_CTX_reset(ctx);
  34. +#endif
  35. EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
  36. EVP_CIPHER_CTX_set_padding(ctx, 0);