Fixup for defines not funcs

git-svn-id: file:///svn/unbound/trunk@3845 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure.ac b/configure.ac
index 5aec63875e0fa41641b191d391fc2068d1e0c968..1bf36630e4bbf3eecca3a782782d251c786bb54b 100644 (file)
--- 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 3fd06e241a95d196b7190ad1338a5cd9eb53d36c..66f705905f3b019dabaa4c9449c64594847f94ff 100644 (file)
--- 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 f5783e1b2addb1a2528363b7fe64ee3c29d6754c..9269fad0b32534728c84b48aeac02ecd365e8214 100644 (file)
--- 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 9338f7d7579a6b2e92f4d1254d2981b1d3c693e4..f3e32d9450ac5393859aa801c1edcc6f47d312ff 100644 (file)
--- 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 8b8eccabdcf377a7019a0e3f33c0af142c2a7905..c22ac7e3ecfb16cf68877a942c3caa9b048213d3 100644 (file)
--- 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 626a6588545036a15eca5e09a69b87a2e69495ef..e7d18e62937fc644ab70d6c25c143fcceaa3036b 100644 (file)
--- 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);