From b722c84b450e157ae1c1400758a9f05fcd4baff0 Mon Sep 17 00:00:00 2001 From: Steffen Moser Date: Mon, 22 Aug 2022 11:22:59 +0200 Subject: [PATCH 1/2] Allow compilation on Solaris 11.4 --- src/apps/common/ns_turn_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/common/ns_turn_utils.c b/src/apps/common/ns_turn_utils.c index d5ce30f..dfb2042 100644 --- a/src/apps/common/ns_turn_utils.c +++ b/src/apps/common/ns_turn_utils.c @@ -154,7 +154,7 @@ static char* str_fac[]={"LOG_AUTH","LOG_CRON","LOG_DAEMON", "LOG_LOCAL2","LOG_LOCAL3","LOG_LOCAL4","LOG_LOCAL5", "LOG_LOCAL6","LOG_LOCAL7","LOG_LPR","LOG_MAIL", "LOG_NEWS","LOG_USER","LOG_UUCP", - "LOG_AUTHPRIV","LOG_FTP","LOG_SYSLOG", + "LOG_AUTHPRIV","LOG_SYSLOG", 0}; static int int_fac[]={LOG_AUTH , LOG_CRON , LOG_DAEMON , @@ -162,7 +162,7 @@ static int int_fac[]={LOG_AUTH , LOG_CRON , LOG_DAEMON , LOG_LOCAL2 , LOG_LOCAL3 , LOG_LOCAL4 , LOG_LOCAL5 , LOG_LOCAL6 , LOG_LOCAL7 , LOG_LPR , LOG_MAIL , LOG_NEWS , LOG_USER , LOG_UUCP, - LOG_AUTHPRIV,LOG_FTP,LOG_SYSLOG, + LOG_AUTHPRIV,LOG_SYSLOG, 0}; static int syslog_facility = 0; From 02461e9fbcb0698b412e1c623432fd6dad2aa524 Mon Sep 17 00:00:00 2001 From: Steffen Moser Date: Tue, 23 Aug 2022 08:58:45 +0200 Subject: [PATCH 2/2] First step to re-enable compilation with OpenSSL 1.0.x --- src/apps/relay/netengine.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/apps/relay/netengine.c b/src/apps/relay/netengine.c index 3921412..bd95625 100644 --- a/src/apps/relay/netengine.c +++ b/src/apps/relay/netengine.c @@ -30,6 +30,17 @@ #include "mainrelay.h" +//////////// Backward compatibility with OpenSSL 1.0.x ////////////// +#define HAVE_OPENSSL11_API (!(OPENSSL_VERSION_NUMBER < 0x10100001L || defined LIBRESSL_VERSION_NUMBER)) + +#ifndef HAVE_SSL_CTX_UP_REF +#define HAVE_SSL_CTX_UP_REF HAVE_OPENSSL11_API +#endif + +#if !HAVE_SSL_CTX_UP_REF +#define SSL_CTX_up_ref(ctx) CRYPTO_add(&(ctx)->references, 1, CRYPTO_LOCK_SSL_CTX) +#endif + //////////// Barrier for the threads ////////////// #if !defined(TURN_NO_THREAD_BARRIERS)