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.

48 lines
1.2 KiB

  1. From cee98e71bb3d69e41cd4d2c6e33c68639dd1eaf0 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Thu, 5 Dec 2019 12:13:44 -0800
  4. Subject: [PATCH] Fix compilation without deprecated APIs
  5. ---
  6. dnssec_verify.c | 2 ++
  7. drill/drill.c | 2 ++
  8. keys.c | 1 +
  9. 3 files changed, 5 insertions(+)
  10. --- a/dnssec_verify.c
  11. +++ b/dnssec_verify.c
  12. @@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE
  13. if (tree->parent_status[i]
  14. == LDNS_STATUS_SSL_ERR) {
  15. printf("; SSL Error: ");
  16. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
  17. ERR_load_crypto_strings();
  18. +#endif
  19. ERR_print_errors_fp(stdout);
  20. printf("\n");
  21. }
  22. --- a/drill/drill.c
  23. +++ b/drill/drill.c
  24. @@ -994,10 +994,12 @@ main(int argc, char *argv[])
  25. xfree(tsig_algorithm);
  26. #ifdef HAVE_SSL
  27. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
  28. CRYPTO_cleanup_all_ex_data();
  29. ERR_free_strings();
  30. EVP_cleanup();
  31. #endif
  32. +#endif
  33. #ifdef USE_WINSOCK
  34. WSACleanup();
  35. #endif
  36. --- a/keys.c
  37. +++ b/keys.c
  38. @@ -15,6 +15,7 @@
  39. #include <ldns/ldns.h>
  40. #ifdef HAVE_SSL
  41. +#include <openssl/ui.h>
  42. #include <openssl/ssl.h>
  43. #include <openssl/rand.h>
  44. #include <openssl/bn.h>