Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

lib/ssl.c: fix libre- and boringssl

Browse source
This commit is contained in:
Enno Boland 2016-05-05 22:08:41 +02:00 • committed by Andy Green
parent aef3dc4ad7
commit 7731a3e575
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changelog
View file

@ -1,6 +1,12 @@
Changelog Changelog
--------- ---------
Fixes
-----
1) OpenSSL version tests not needed on LibreSSL and BoringSSL
v2.0.0 v2.0.0
====== ======

8
lib/ssl.c
View file

@ -197,7 +197,9 @@ lws_ssl_destroy(struct lws_vhost *vhost)
#if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL) #if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL)
ERR_remove_state(0); ERR_remove_state(0);
#else #else
#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) #if (OPENSSL_VERSION_NUMBER >= 0x10100005L) && \
!defined(LIBRESSL_VERSION_NUMBER) && \
!defined(OPENSSL_IS_BORINGSSL)
ERR_remove_thread_state(); ERR_remove_thread_state();
#else #else
ERR_remove_thread_state(NULL); ERR_remove_thread_state(NULL);
@ -689,7 +691,9 @@ lws_ssl_context_destroy(struct lws_context *context)
#if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL) #if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL)
ERR_remove_state(0); ERR_remove_state(0);
#else #else
#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) #if (OPENSSL_VERSION_NUMBER >= 0x10100005L) && \
!defined(LIBRESSL_VERSION_NUMBER) && \
!defined(OPENSSL_IS_BORINGSSL)
ERR_remove_thread_state(); ERR_remove_thread_state();
#else #else
ERR_remove_thread_state(NULL); ERR_remove_thread_state(NULL);