Fix compilation without deprecated APIs

diff --git a/dnssec_verify.c b/dnssec_verify.c
index d22962eb907ad4b5979292804e0960f85d8bdd0d..99a7515dc4b4cda4baec33498eec4e61123f3bb4 100644 (file)
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE *out,
                                                if (tree->parent_status[i]
                                                    == LDNS_STATUS_SSL_ERR) {
                                                        printf("; SSL Error: ");
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
                                                        ERR_load_crypto_strings();
+#endif
                                                        ERR_print_errors_fp(stdout);
                                                        printf("\n");
                                                }

diff --git a/drill/drill.c b/drill/drill.c
index 6efd29a5ca49bb433b140601f2321b2c48cf79ad..186bdff29875c948099ec0ab7791c33b9574e7d6 100644 (file)
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -994,10 +994,12 @@ main(int argc, char *argv[])
        xfree(tsig_algorithm);
 
 #ifdef HAVE_SSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
        CRYPTO_cleanup_all_ex_data();
        ERR_free_strings();
        EVP_cleanup();
 #endif
+#endif
 #ifdef USE_WINSOCK
        WSACleanup();
 #endif

diff --git a/keys.c b/keys.c
index 016f9731114aee0e760381ad6a71c50bed953470..06afb73939fef48559ea6e7ec89eb2ee0951084c 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -15,6 +15,7 @@
 #include <ldns/ldns.h>
 
 #ifdef HAVE_SSL
+#include <openssl/ui.h>
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
 #include <openssl/bn.h>