From 27c2fff0f2fef695b0599fc3931cacfc16376e88 Mon Sep 17 00:00:00 2001 From: Dag-Erling Smørgrav Date: Tue, 27 Sep 2016 21:11:07 +0000 Subject: import unbound 1.5.10 --- testcode/streamtcp.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'testcode/streamtcp.c') diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c index b78506beb5df..05dcf98a85ec 100644 --- a/testcode/streamtcp.c +++ b/testcode/streamtcp.c @@ -406,8 +406,18 @@ int main(int argc, char** argv) } if(usessl) { ERR_load_SSL_strings(); +#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO) OpenSSL_add_all_algorithms(); - SSL_library_init(); +#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(0, NULL); +#endif } send_em(svr, udp, usessl, noanswer, argc, argv); checklock_stop(); -- cgit v1.3