diff --git a/src/ssl.c b/src/ssl.c index ebc6c4644..8457715bb 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -24357,7 +24357,8 @@ WOLFSSL_API int SSL_SESSION_set1_id_context(WOLFSSL_SESSION *s, const unsigned c } #endif -#if defined(OPENSSL_ALL) || defined(WOLFSSL_APACHE_HTTPD) +#if defined(OPENSSL_ALL) || defined(WOLFSSL_APACHE_HTTPD) \ + || defined(WOLFSSL_HAPROXY) /* Returns X509_ALGOR struct with signature algorithm */ const WOLFSSL_X509_ALGOR* wolfSSL_X509_get0_tbs_sigalg(const WOLFSSL_X509 *x509) { @@ -24434,7 +24435,7 @@ int wolfSSL_X509_PUBKEY_get0_param(WOLFSSL_ASN1_OBJECT **ppkalg, return WOLFSSL_SUCCESS; } -#endif /* OPENSSL_ALL || WOLFSSL_APACHE_HTTPD */ +#endif /* OPENSSL_ALL || WOLFSSL_APACHE_HTTPD || WOLFSSL_HAPROXY*/ #ifndef NO_WOLFSSL_STUB /*** TBD ***/ @@ -39020,7 +39021,7 @@ int wolfSSL_get_state(const WOLFSSL* ssl) } #endif /* HAVE_LIGHTY || HAVE_STUNNEL || WOLFSSL_MYSQL_COMPATIBLE */ -#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) +#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) || defined(WOLFSSL_HAPROXY) #ifndef NO_WOLFSSL_STUB long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt) @@ -39430,7 +39431,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_PrivateKey_EVP(WOLFSSL_EVP_PKEY** out, #endif /* HAVE_ECC */ return pkey; } -#endif /* OPENSSL_ALL || WOLFSSL_ASIO */ +#endif /* OPENSSL_ALL || WOLFSSL_ASIO || WOLFSSL_HAPROXY */ /* stunnel compatibility functions*/ diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 56509903e..4a16af186 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -1830,7 +1830,7 @@ struct Suites { byte setSuites; /* user set suites from default */ byte hashAlgo; /* selected hash algorithm */ byte sigAlgo; /* selected sig algorithm */ -#ifdef OPENSSL_ALL +#if defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) WOLF_STACK_OF(WOLFSSL_CIPHER)* stack; /* stack of available cipher suites */ #endif }; @@ -3645,7 +3645,7 @@ struct WOLFSSL_X509 { #endif WOLFSSL_X509_NAME issuer; WOLFSSL_X509_NAME subject; -#if defined(OPENSSL_ALL) +#if defined(OPENSSL_ALL) || defined(WOLFSSL_HAPROXY) WOLFSSL_X509_ALGOR algor; WOLFSSL_X509_PUBKEY key; #endif diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index 39e898fe7..7757bbba1 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -801,7 +801,7 @@ enum { #define sk_SSL_CIPHER_free wolfSSL_sk_SSL_CIPHER_free #define sk_SSL_CIPHER_find wolfSSL_sk_SSL_CIPHER_find -#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) +#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) || defined(WOLFSSL_HAPROXY) #include #define SSL_CTRL_CHAIN 88 diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index dd4333af2..af8599ee9 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -813,7 +813,7 @@ WOLFSSL_API WOLFSSL_SESSION* wolfSSL_get_session(WOLFSSL*); WOLFSSL_API void wolfSSL_flush_sessions(WOLFSSL_CTX*, long); WOLFSSL_API int wolfSSL_SetServerID(WOLFSSL*, const unsigned char*, int, int); -#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) +#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) || defined(WOLFSSL_HAPROXY) WOLFSSL_API int wolfSSL_BIO_new_bio_pair(WOLFSSL_BIO**, size_t, WOLFSSL_BIO**, size_t);