MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-29 00:44:17 +01:00
Code Issues Releases Wiki Activity

LibreSSL have far advanced OPENSSL_VERSION_NUMBER beyond the

Browse source 
feature set they support (2.0 even!), deliberately breaking
backward compatibility. Therefore, in order to fix a regression
introduced by commit a4c8c827 with regard to LibreSSL's stupidity,
unconditionally use the old TLS API if building against LibreSSL.
This commit is contained in:
Aaron Jones 2015-06-25 13:57:07 +00:00
parent cb266283f8
commit 1a4e224a4e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libratbox/src/openssl.c
View file

@ -307,7 +307,7 @@ rb_init_ssl(void)
SSL_library_init(); SSL_library_init();
libratbox_index = SSL_get_ex_new_index(0, libratbox_data, NULL, NULL, NULL); libratbox_index = SSL_get_ex_new_index(0, libratbox_data, NULL, NULL, NULL);
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) #if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
ssl_server_ctx = SSL_CTX_new(SSLv23_server_method()); ssl_server_ctx = SSL_CTX_new(SSLv23_server_method());
#else #else
ssl_server_ctx = SSL_CTX_new(TLS_server_method()); ssl_server_ctx = SSL_CTX_new(TLS_server_method());
@ -322,7 +322,7 @@ rb_init_ssl(void)
long server_options = SSL_CTX_get_options(ssl_server_ctx); long server_options = SSL_CTX_get_options(ssl_server_ctx);
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) #if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
server_options |= SSL_OP_NO_SSLv2; server_options |= SSL_OP_NO_SSLv2;
server_options |= SSL_OP_NO_SSLv3; server_options |= SSL_OP_NO_SSLv3;
#endif #endif
@ -356,7 +356,7 @@ rb_init_ssl(void)
} }
#endif #endif
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) #if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
ssl_client_ctx = SSL_CTX_new(TLSv1_client_method()); ssl_client_ctx = SSL_CTX_new(TLSv1_client_method());
#else #else
ssl_client_ctx = SSL_CTX_new(TLS_client_method()); ssl_client_ctx = SSL_CTX_new(TLS_client_method());