libs/ldns/patches/010-openssl-deprecated.patch

   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 ---
   7  dnssec_verify.c | 2 ++
   8  drill/drill.c   | 2 ++
   9  keys.c          | 1 +
  10  3 files changed, 5 insertions(+)
  11
  12 diff --git a/dnssec_verify.c b/dnssec_verify.c
  13 index d22962eb..99a7515d 100644
  14 --- a/dnssec_verify.c
  15 +++ b/dnssec_verify.c
  16 @@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE *out,
  17                                                 if (tree->parent_status[i]
  18                                                     == LDNS_STATUS_SSL_ERR) {
  19                                                         printf("; SSL Error: ");
  20 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
  21                                                         ERR_load_crypto_strings();
  22 +#endif
  23                                                         ERR_print_errors_fp(stdout);
  24                                                         printf("\n");
  25                                                 }
  26 diff --git a/drill/drill.c b/drill/drill.c
  27 index 6efd29a5..186bdff2 100644
  28 --- a/drill/drill.c
  29 +++ b/drill/drill.c
  30 @@ -994,10 +994,12 @@ main(int argc, char *argv[])
  31         xfree(tsig_algorithm);
  32
  33  #ifdef HAVE_SSL
  34 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
  35         CRYPTO_cleanup_all_ex_data();
  36         ERR_free_strings();
  37         EVP_cleanup();
  38  #endif
  39 +#endif
  40  #ifdef USE_WINSOCK
  41         WSACleanup();
  42  #endif
  43 diff --git a/keys.c b/keys.c
  44 index 016f9731..06afb739 100644
  45 --- a/keys.c
  46 +++ b/keys.c
  47 @@ -15,6 +15,7 @@
  48  #include <ldns/ldns.h>
  49
  50  #ifdef HAVE_SSL
  51 +#include <openssl/ui.h>
  52  #include <openssl/ssl.h>
  53  #include <openssl/rand.h>
  54  #include <openssl/bn.h>