mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-01-18 12:42:54 -05:00
- Fix that testcode dohclient has OpenSSL initialisation calls.
This commit is contained in:
parent
a45a7efe69
commit
7226d2f9f2
2 changed files with 20 additions and 1 deletions
|
|
@ -4,6 +4,7 @@
|
|||
- Fix #468: OpenSSL 1.0.1 can no longer build Unbound.
|
||||
- Further fix for #468: detect SSL_CTX_set_alpn_protos for build with
|
||||
OpenSSL 1.0.1.
|
||||
- Fix that testcode dohclient has OpenSSL initialisation calls.
|
||||
|
||||
13 April 2021: George
|
||||
- Fix documentation comment for files previously residing in checkconf/.
|
||||
|
|
|
|||
|
|
@ -622,7 +622,25 @@ int main(int argc, char** argv)
|
|||
return 1;
|
||||
}
|
||||
|
||||
|
||||
if(!no_tls) {
|
||||
#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)
|
||||
# ifndef S_SPLINT_S
|
||||
OpenSSL_add_all_algorithms();
|
||||
# endif
|
||||
#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 || !defined(HAVE_OPENSSL_INIT_SSL)
|
||||
(void)SSL_library_init();
|
||||
#else
|
||||
(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
|
||||
#endif
|
||||
}
|
||||
run(h2_session, port, no_tls, argc, argv);
|
||||
|
||||
checklock_stop();
|
||||
|
|
|
|||
Loading…
Reference in a new issue