From c1fd3ee3c3621c12593a6f7d164af49f48400222 Mon Sep 17 00:00:00 2001 From: ritt Date: Tue, 11 Feb 2020 10:49:34 +0100 Subject: [PATCH] Use different TLS methods for OpenSSL 1.0 and 1.1 --- src/elog.c | 6 +++++- src/elogd.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/elog.c b/src/elog.c index 0b9a6e4b..51b721e5 100755 --- a/src/elog.c +++ b/src/elog.c @@ -304,8 +304,12 @@ int ssl_connect(int sock, SSL ** ssl_con) SSL_library_init(); SSL_load_error_strings(); - + +#if OPENSSL_VERSION_NUMBER > 0x1010000fL meth = (SSL_METHOD *) TLS_method(); +#else + meth = (SSL_METHOD *) TLSv1_2_method(); +#endif ctx = SSL_CTX_new(meth); *ssl_con = SSL_new(ctx); diff --git a/src/elogd.c b/src/elogd.c index e4913841..ace63507 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -2457,7 +2457,11 @@ int ssl_connect(int sock, SSL **ssl_con) { SSL_library_init(); SSL_load_error_strings(); +#if OPENSSL_VERSION_NUMBER > 0x1010000fL meth = (SSL_METHOD *) TLS_method(); +#else + meth = (SSL_METHOD *) TLSv1_2_method(); +#endif ctx = SSL_CTX_new(meth); *ssl_con = SSL_new(ctx); @@ -29508,7 +29512,11 @@ SSL_CTX *init_ssl(void) { SSL_library_init(); SSL_load_error_strings(); +#if OPENSSL_VERSION_NUMBER > 0x1010000fL meth = (SSL_METHOD *) TLS_method(); +#else + meth = (SSL_METHOD *) TLSv1_2_method(); +#endif ctx = SSL_CTX_new(meth); if (getcfg("global", "SSL Passphrase", pwd, sizeof(pwd))) {