- Test for openssl init_crypto and init_ssl functions.

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

diff --git a/config.h.in b/config.h.in
index 245ea490fc6dd16dae6cf3b30d3f8640d3265aa4..04fc74396e95295fdd391e153992412d819ea459 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -299,6 +299,12 @@
 /* Define to 1 if you have the <openssl/err.h> header file. */
 #undef HAVE_OPENSSL_ERR_H
 
+/* Define to 1 if you have the `OPENSSL_init_crypto' function. */
+#undef HAVE_OPENSSL_INIT_CRYPTO
+
+/* Define to 1 if you have the `OPENSSL_init_ssl' function. */
+#undef HAVE_OPENSSL_INIT_SSL
+
 /* Define to 1 if you have the <openssl/rand.h> header file. */
 #undef HAVE_OPENSSL_RAND_H
 

diff --git a/configure b/configure
index b5a9f4941eee90e9f98679e9b9a5334999d617d8..b852a7e6c4c46f683650c9fbc733b6f2df287484 100755 (executable)
--- a/configure
+++ b/configure
@@ -17535,7 +17535,7 @@ fi
 
 done
 
-for ac_func in 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
+for ac_func in OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto OPENSSL_init_ssl EVP_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

diff --git a/configure.ac b/configure.ac
index 1bf36630e4bbf3eecca3a782782d251c786bb54b..c582ef1f32887a1bfa48bc317bdb42b83f84e13e 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 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 OPENSSL_init_crypto OPENSSL_init_ssl 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 66f705905f3b019dabaa4c9449c64594847f94ff..2ed9af8fe66f635d568cdb66b30dcdbcdca715dc 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
-#  if OPENSSL_VERSION_NUMBER < 0x10100000
+#  if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        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
-#  if OPENSSL_VERSION_NUMBER < 0x10100000
+#  if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #  else
        (void)OPENSSL_init_ssl(0, NULL);

diff --git a/doc/Changelog b/doc/Changelog
index 35cff7d6d292567af85b3f845b510e02a7084bd7..76966c233c0b3598138d1bc835b6dbbb0e6a68aa 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 15 September 2016: Wouter
        - Fix 883: error for duplicate local zone entry.
+       - Test for openssl init_crypto and init_ssl functions.
 
 15 September 2016: Ralph
        - fix potential memory leak in daemon/remote.c and nullpointer

diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index 08b8641a4a2011e58f745ddca6f2c5093cd0e23f..00ab5e2ae0ef6f872e46461b01a9ddef95417b74 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();
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        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
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #else
        (void)OPENSSL_init_ssl(0, NULL);

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index ffaf5e04d57a704e1c0bffb28460f070ce7dada9..19268edabde743f5d2dd88345d5b3967f9569121 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();
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        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
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #else
        (void)OPENSSL_init_ssl(0, NULL);

diff --git a/testcode/petal.c b/testcode/petal.c
index be8f3bde00f45072f009764d9d450d2510f56377..b30549365f514946df5ebb215542e6ac097106fc 100644 (file)
--- a/testcode/petal.c
+++ b/testcode/petal.c
@@ -644,14 +644,14 @@ int main(int argc, char* argv[])
        ERR_load_crypto_strings();
 #endif
        ERR_load_SSL_strings();
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        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
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #else
        (void)OPENSSL_init_ssl(0, NULL);

diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index e7d18e62937fc644ab70d6c25c143fcceaa3036b..05dcf98a85ec385cc5bd9330410d774c2cdce859 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();
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
                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
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
                (void)SSL_library_init();
 #else
                (void)OPENSSL_init_ssl(0, NULL);