- Fix openssl 1.1.0 load of ssl error strings from ssl init.

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

diff --git a/daemon/daemon.c b/daemon/daemon.c
index e8d56aec9b1dfdc1cbd3a0b814246ff5e7a20dc3..e95dbfbc335f1485db2e4f6724318d8abace314b 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -221,7 +221,9 @@ daemon_init(void)
 #  ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
        ERR_load_crypto_strings();
 #  endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        ERR_load_SSL_strings();
+#endif
 #  ifdef USE_GOST
        (void)sldns_key_EVP_load_gost_id();
 #  endif
@@ -239,7 +241,7 @@ daemon_init(void)
 #  if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #  else
-       (void)OPENSSL_init_ssl(0, NULL);
+       (void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
 #  endif
 #  if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED)
        if(!ub_openssl_lock_init())

diff --git a/doc/Changelog b/doc/Changelog
index c1a9ce56e580190089daf409c44ad407a7d21157..e9510a5bc614b9b0f3c4d05786e47b72aa6aeeec 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
        - Fix #1331: libunbound segfault in threaded mode when context is
          deleted.
        - Fix pythonmod link line option flag.
+       - Fix openssl 1.1.0 load of ssl error strings from ssl init.
 
 29 June 2017: Wouter
        - Fix python example0 return module wait instead of error for pass.

diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index 19ee85b1aaaaf464429514ba6ac71482cdbd30c5..c060ad394c1d973c18c95d048bbafb1d65f9bc16 100644 (file)
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -2326,7 +2326,9 @@ int main(int argc, char* argv[])
 #ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
        ERR_load_crypto_strings();
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        ERR_load_SSL_strings();
+#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        OpenSSL_add_all_algorithms();
 #else
@@ -2337,7 +2339,7 @@ int main(int argc, char* argv[])
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #else
-       (void)OPENSSL_init_ssl(0, NULL);
+       (void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
 #endif
 
        if(dolist) do_list_builtin();

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index aa2db4a61dfbc767294a9ded6bc524001a5f8198..c6dcc8eab8a1536d05689e2e6c7576955a15a8ad 100644 (file)
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -763,7 +763,9 @@ int main(int argc, char* argv[])
 #ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
        ERR_load_crypto_strings();
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        ERR_load_SSL_strings();
+#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        OpenSSL_add_all_algorithms();
 #else
@@ -774,7 +776,7 @@ int main(int argc, char* argv[])
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #else
-       (void)OPENSSL_init_ssl(0, NULL);
+       (void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
 #endif
 
        if(!RAND_status()) {

diff --git a/testcode/petal.c b/testcode/petal.c
index b30549365f514946df5ebb215542e6ac097106fc..1c26fa700346dd59dcd49736dbc2c57ca993edd1 100644 (file)
--- a/testcode/petal.c
+++ b/testcode/petal.c
@@ -643,7 +643,9 @@ int main(int argc, char* argv[])
 #ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
        ERR_load_crypto_strings();
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        ERR_load_SSL_strings();
+#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
        OpenSSL_add_all_algorithms();
 #else
@@ -654,7 +656,7 @@ int main(int argc, char* argv[])
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
        (void)SSL_library_init();
 #else
-       (void)OPENSSL_init_ssl(0, NULL);
+       (void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
 #endif
 
        do_service(addr, port, key, cert);

diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index f5eb8fc48b1da803e69fe26571feed93fb339ff3..b494507def2659d8dc0d779b0f675ff6dbfaa655 100644 (file)
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -410,7 +410,9 @@ int main(int argc, char** argv)
                return 1;
        }
        if(usessl) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
                ERR_load_SSL_strings();
+#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
                OpenSSL_add_all_algorithms();
 #else
@@ -421,7 +423,7 @@ int main(int argc, char** argv)
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
                (void)SSL_library_init();
 #else
-               (void)OPENSSL_init_ssl(0, NULL);
+               (void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
 #endif
        }
        send_em(svr, udp, usessl, noanswer, argc, argv);