feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #1716 from cariepointer/osp/haproxy

Browse Source 
Define functions required by HAProxy and enable SSLV3 dependency
This commit is contained in:
Chris Conlon
2018-07-30 13:26:38 -06:00
committed by GitHub
parent 04e16b8df8 a1f69f0d64
commit 1079b0e3b3
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -1529,6 +1529,11 @@ AC_ARG_ENABLE([sslv3],
[ ENABLED_SSLV3=no] [ ENABLED_SSLV3=no]
) )
if test "x$ENABLED_HAPROXY" = "xyes"
then
ENABLED_SSLV3="yes"
fi
if test "$ENABLED_SSLV3" = "yes" if test "$ENABLED_SSLV3" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALLOW_SSLV3" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALLOW_SSLV3"

5
src/ssl.c
View File

@@ -31545,8 +31545,9 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_PrivateKey_EVP(WOLFSSL_EVP_PKEY** out,
/* stunnel compatibility functions*/ /* stunnel compatibility functions*/
#if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) \ #if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) || \
|| defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY))) defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY) || \
defined(WOLFSSL_HAPROXY)))
void wolfSSL_ERR_remove_thread_state(void* pid) void wolfSSL_ERR_remove_thread_state(void* pid)
{ {
(void) pid; (void) pid;

4
wolfssl/internal.h
View File

@@ -2558,7 +2558,9 @@ struct WOLFSSL_CTX {
CallbackALPNSelect alpnSelect; CallbackALPNSelect alpnSelect;
void* alpnSelectArg; void* alpnSelectArg;
#endif #endif
#if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY))) #if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) || \
defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY) || \
defined(WOLFSSL_HAPROXY)))
CallbackSniRecv sniRecvCb; CallbackSniRecv sniRecvCb;
void* sniRecvCbArg; void* sniRecvCbArg;
#endif #endif