diff --git a/configure.ac b/configure.ac index ec983b8f2..d83a867c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1529,6 +1529,11 @@ AC_ARG_ENABLE([sslv3], [ ENABLED_SSLV3=no] ) +if test "x$ENABLED_HAPROXY" = "xyes" +then + ENABLED_SSLV3="yes" +fi + if test "$ENABLED_SSLV3" = "yes" then AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALLOW_SSLV3" diff --git a/src/ssl.c b/src/ssl.c index 3b094d083..767402d32 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -31545,8 +31545,9 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_PrivateKey_EVP(WOLFSSL_EVP_PKEY** out, /* stunnel compatibility functions*/ -#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))) void wolfSSL_ERR_remove_thread_state(void* pid) { (void) pid; diff --git a/wolfssl/internal.h b/wolfssl/internal.h index f437714f5..d4dd5fb92 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -2558,7 +2558,9 @@ struct WOLFSSL_CTX { CallbackALPNSelect alpnSelect; void* alpnSelectArg; #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; void* sniRecvCbArg; #endif