0001-lib-crypto-c_src-openssl_config.h-fix-build-without-.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. From 8c7d62662cf51902d759be0e8d3bfd96a3524b3c Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Fri, 8 Dec 2023 09:00:17 +0100
  4. Subject: [PATCH] lib/crypto/c_src/openssl_config.h: fix build without DES
  5. Fix the following build failure without DES raised since version 24.2
  6. and
  7. https://github.com/erlang/otp/commit/abf7f84c2f77bb07dbdbb8a29b9d41f1f24c5f14:
  8. cipher.c:51:42: error: 'EVP_des_ede3_cbc' undeclared here (not in a function); did you mean 'SN_des_ede3_cbc'?
  9. 51 | {{"des_ede3_cbc"}, "des-ede3-cbc", {&EVP_des_ede3_cbc}, 0, 0},
  10. | ^~~~~~~~~~~~~~~~
  11. | SN_des_ede3_cbc
  12. Fixes:
  13. - http://autobuild.buildroot.org/results/1aace0ee738f8ec4aa2c9a739fc7535c3b6bf884
  14. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  15. Upstream: https://github.com/erlang/otp/pull/7937
  16. ---
  17. lib/crypto/c_src/openssl_config.h | 2 +-
  18. 1 file changed, 1 insertion(+), 1 deletion(-)
  19. diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h
  20. index cb63f28369..f3904986c9 100644
  21. --- a/lib/crypto/c_src/openssl_config.h
  22. +++ b/lib/crypto/c_src/openssl_config.h
  23. @@ -218,7 +218,6 @@
  24. #ifndef OPENSSL_NO_DES
  25. # define HAVE_DES
  26. -#endif
  27. #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e')
  28. # define HAVE_DES_ede3_cfb
  29. @@ -227,6 +226,7 @@
  30. #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e')
  31. # define HAVE_DES_ede3_cbc
  32. #endif
  33. +#endif
  34. #ifndef OPENSSL_NO_DH
  35. # define HAVE_DH
  36. --
  37. 2.42.0