From 7ef6c46aaf6a31cc7ca17a2e268334459fbfdccd Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 2 Sep 2016 11:20:21 +0000
Subject: [PATCH] Fixup for defines not funcs

git-svn-id: file:///svn/unbound/trunk@3845 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 configure.ac               | 2 +-
 daemon/daemon.c            | 4 ++--
 smallapp/unbound-anchor.c  | 4 ++--
 smallapp/unbound-control.c | 4 ++--
 testcode/petal.c           | 4 ++--
 testcode/streamtcp.c       | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5aec63875..1bf36630e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -673,7 +673,7 @@ else
 	AC_MSG_RESULT([no])
 fi
 AC_CHECK_HEADERS([openssl/conf.h openssl/engine.h openssl/bn.h openssl/dh.h openssl/dsa.h openssl/rsa.h],,, [AC_INCLUDES_DEFAULT])
-AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests EVP_cleanup ERR_load_crypto_strings OpenSSL_add_all_algorithms SSL_library_init CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup])
+AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests EVP_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup])
 AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto], [], [], [
 AC_INCLUDES_DEFAULT
 #ifdef HAVE_OPENSSL_ERR_H
diff --git a/daemon/daemon.c b/daemon/daemon.c
index 3fd06e241..66f705905 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -211,7 +211,7 @@ daemon_init(void)
 #  ifdef USE_GOST
 	(void)sldns_key_EVP_load_gost_id();
 #  endif
-#  ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
+#  if OPENSSL_VERSION_NUMBER < 0x10100000
 	OpenSSL_add_all_algorithms();
 #  else
 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
@@ -222,7 +222,7 @@ daemon_init(void)
 	/* grab the COMP method ptr because openssl leaks it */
 	comp_meth = (void*)SSL_COMP_get_compression_methods();
 #  endif
-#  ifdef HAVE_SSL_LIBRARY_INIT
+#  if OPENSSL_VERSION_NUMBER < 0x10100000
 	(void)SSL_library_init();
 #  else
 	(void)OPENSSL_init_ssl(0, NULL);
diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index f5783e1b2..9269fad0b 100644
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -2315,14 +2315,14 @@ int main(int argc, char* argv[])
 	ERR_load_crypto_strings();
 #endif
 	ERR_load_SSL_strings();
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 	OpenSSL_add_all_algorithms();
 #else
 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
 		| OPENSSL_INIT_ADD_ALL_DIGESTS
 		| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 #endif
-#ifdef HAVE_SSL_LIBRARY_INIT
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 	(void)SSL_library_init();
 #else
 	(void)OPENSSL_init_ssl(0, NULL);
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 9338f7d75..f3e32d945 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -422,14 +422,14 @@ int main(int argc, char* argv[])
 	ERR_load_crypto_strings();
 #endif
 	ERR_load_SSL_strings();
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 	OpenSSL_add_all_algorithms();
 #else
 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
 		| OPENSSL_INIT_ADD_ALL_DIGESTS
 		| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 #endif
-#ifdef HAVE_SSL_LIBRARY_INIT
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 	(void)SSL_library_init();
 #else
 	(void)OPENSSL_init_ssl(0, NULL);
diff --git a/testcode/petal.c b/testcode/petal.c
index 8b8eccabd..c22ac7e3e 100644
--- a/testcode/petal.c
+++ b/testcode/petal.c
@@ -638,14 +638,14 @@ int main(int argc, char* argv[])
 	ERR_load_crypto_strings();
 #endif
 	ERR_load_SSL_strings();
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 	OpenSSL_add_all_algorithms();
 #else
 	OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
 		| OPENSSL_INIT_ADD_ALL_DIGESTS
 		| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 #endif
-#ifdef HAVE_SSL_LIBRARY_INIT
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 	(void)SSL_library_init();
 #else
 	(void)OPENSSL_init_ssl(0, NULL);
diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index 626a65885..e7d18e629 100644
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -406,14 +406,14 @@ int main(int argc, char** argv)
 	}
 	if(usessl) {
 		ERR_load_SSL_strings();
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 		OpenSSL_add_all_algorithms();
 #else
 		OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
 			| OPENSSL_INIT_ADD_ALL_DIGESTS
 			| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
 #endif
-#ifdef HAVE_SSL_LIBRARY_INIT
+#if OPENSSL_VERSION_NUMBER < 0x10100000
 		(void)SSL_library_init();
 #else
 		(void)OPENSSL_init_ssl(0, NULL);
-- 
2.47.3