mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-26 04:21:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix build with libressl 3.6+ (#1198)

Browse Source 
Tested on FreeBSD 13/stable
This commit is contained in:
rim 2023-05-15 02:38:58 +03:00 committed by GitHub
parent d526e7afcc
commit 7bc932a905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/apps/relay/mainrelay.c
View File

@ -43,10 +43,7 @@
#define FREE(x) HeapFree(GetProcessHeap(), 0, (x)) #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
#endif #endif
#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) #if (!defined OPENSSL_VERSION_1_1_1)
#undef OPENSSL_VERSION_NUMBER
#define OPENSSL_VERSION_NUMBER 0x1000107FL
#elif (!defined OPENSSL_VERSION_1_1_1)
#define OPENSSL_VERSION_1_1_1 0x10101000L #define OPENSSL_VERSION_1_1_1 0x10101000L
#endif #endif
@ -3528,7 +3525,7 @@ static void set_ctx(SSL_CTX **out, const char *protocol, const SSL_METHOD *metho
if (!(turn_params.cipher_list[0])) { if (!(turn_params.cipher_list[0])) {
strncpy(turn_params.cipher_list, DEFAULT_CIPHER_LIST, TURN_LONG_STRING_SIZE); strncpy(turn_params.cipher_list, DEFAULT_CIPHER_LIST, TURN_LONG_STRING_SIZE);
#if TLSv1_3_SUPPORTED #if defined(DEFAULT_CIPHERSUITES)
strncat(turn_params.cipher_list, ":", TURN_LONG_STRING_SIZE - strlen(turn_params.cipher_list)); strncat(turn_params.cipher_list, ":", TURN_LONG_STRING_SIZE - strlen(turn_params.cipher_list));
strncat(turn_params.cipher_list, DEFAULT_CIPHERSUITES, TURN_LONG_STRING_SIZE - strlen(turn_params.cipher_list)); strncat(turn_params.cipher_list, DEFAULT_CIPHERSUITES, TURN_LONG_STRING_SIZE - strlen(turn_params.cipher_list));
#endif #endif

2
src/apps/relay/mainrelay.h
View File

@ -109,7 +109,7 @@ extern "C" {
#endif #endif
#else #else
#define DEFAULT_CIPHER_LIST "DEFAULT" #define DEFAULT_CIPHER_LIST "DEFAULT"
#if TLSv1_3_SUPPORTED #if TLSv1_3_SUPPORTED && defined(TLS_DEFAULT_CIPHERSUITES)
#define DEFAULT_CIPHERSUITES TLS_DEFAULT_CIPHERSUITES #define DEFAULT_CIPHERSUITES TLS_DEFAULT_CIPHERSUITES
#endif #endif
#endif #endif

3
src/apps/relay/netengine.c
View File

@ -31,7 +31,8 @@
#include "mainrelay.h" #include "mainrelay.h"
//////////// Backward compatibility with OpenSSL 1.0.x ////////////// //////////// Backward compatibility with OpenSSL 1.0.x //////////////
#if (OPENSSL_VERSION_NUMBER < 0x10100001L || defined LIBRESSL_VERSION_NUMBER) #if (OPENSSL_VERSION_NUMBER < 0x10100001L || \
(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <= 0x3040000fL))
#define SSL_CTX_up_ref(ctx) CRYPTO_add(&(ctx)->references, 1, CRYPTO_LOCK_SSL_CTX) #define SSL_CTX_up_ref(ctx) CRYPTO_add(&(ctx)->references, 1, CRYPTO_LOCK_SSL_CTX)
#endif #endif

8
src/apps/relay/ns_ioalib_engine_impl.c
View File

@ -1364,13 +1364,11 @@ static void set_socket_ssl(ioa_socket_handle s, SSL *ssl) {
SSL_set_app_data(ssl, s); SSL_set_app_data(ssl, s);
SSL_set_info_callback(ssl, (ssl_info_callback_t)ssl_info_callback); SSL_set_info_callback(ssl, (ssl_info_callback_t)ssl_info_callback);
SSL_set_options(ssl, SSL_set_options(ssl,
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
#endif
#else
#if defined(SSL_OP_NO_RENEGOTIATION) #if defined(SSL_OP_NO_RENEGOTIATION)
SSL_OP_NO_RENEGOTIATION SSL_OP_NO_RENEGOTIATION
#else
#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
#endif #endif
#endif #endif
); );