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

Fix defines for HAProxy build

Browse Source
This commit is contained in:
Aaron Jense
2019-09-26 12:55:30 -06:00
parent 937a344682
commit bfa20c53b0
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ssl.c
View File

@ -24357,7 +24357,8 @@ WOLFSSL_API int SSL_SESSION_set1_id_context(WOLFSSL_SESSION *s, const unsigned c
} }
#endif #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 */ /* Returns X509_ALGOR struct with signature algorithm */
const WOLFSSL_X509_ALGOR* wolfSSL_X509_get0_tbs_sigalg(const WOLFSSL_X509 *x509) 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; return WOLFSSL_SUCCESS;
} }
#endif /* OPENSSL_ALL || WOLFSSL_APACHE_HTTPD */ #endif /* OPENSSL_ALL || WOLFSSL_APACHE_HTTPD || WOLFSSL_HAPROXY*/
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
/*** TBD ***/ /*** TBD ***/
@ -39020,7 +39021,7 @@ int wolfSSL_get_state(const WOLFSSL* ssl)
} }
#endif /* HAVE_LIGHTY || HAVE_STUNNEL || WOLFSSL_MYSQL_COMPATIBLE */ #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 #ifndef NO_WOLFSSL_STUB
long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt) 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 */ #endif /* HAVE_ECC */
return pkey; return pkey;
} }
#endif /* OPENSSL_ALL || WOLFSSL_ASIO */ #endif /* OPENSSL_ALL || WOLFSSL_ASIO || WOLFSSL_HAPROXY */
/* stunnel compatibility functions*/ /* stunnel compatibility functions*/

4
wolfssl/internal.h
View File

@ -1830,7 +1830,7 @@ struct Suites {
byte setSuites; /* user set suites from default */ byte setSuites; /* user set suites from default */
byte hashAlgo; /* selected hash algorithm */ byte hashAlgo; /* selected hash algorithm */
byte sigAlgo; /* selected sig 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 */ WOLF_STACK_OF(WOLFSSL_CIPHER)* stack; /* stack of available cipher suites */
#endif #endif
}; };
@ -3645,7 +3645,7 @@ struct WOLFSSL_X509 {
#endif #endif
WOLFSSL_X509_NAME issuer; WOLFSSL_X509_NAME issuer;
WOLFSSL_X509_NAME subject; WOLFSSL_X509_NAME subject;
#if defined(OPENSSL_ALL) #if defined(OPENSSL_ALL) || defined(WOLFSSL_HAPROXY)
WOLFSSL_X509_ALGOR algor; WOLFSSL_X509_ALGOR algor;
WOLFSSL_X509_PUBKEY key; WOLFSSL_X509_PUBKEY key;
#endif #endif

2
wolfssl/openssl/ssl.h
View File

@ -801,7 +801,7 @@ enum {
#define sk_SSL_CIPHER_free wolfSSL_sk_SSL_CIPHER_free #define sk_SSL_CIPHER_free wolfSSL_sk_SSL_CIPHER_free
#define sk_SSL_CIPHER_find wolfSSL_sk_SSL_CIPHER_find #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 <wolfssl/openssl/pem.h> #include <wolfssl/openssl/pem.h>
#define SSL_CTRL_CHAIN 88 #define SSL_CTRL_CHAIN 88

2
wolfssl/ssl.h
View File

@ -813,7 +813,7 @@ WOLFSSL_API WOLFSSL_SESSION* wolfSSL_get_session(WOLFSSL*);
WOLFSSL_API void wolfSSL_flush_sessions(WOLFSSL_CTX*, long); WOLFSSL_API void wolfSSL_flush_sessions(WOLFSSL_CTX*, long);
WOLFSSL_API int wolfSSL_SetServerID(WOLFSSL*, const unsigned char*, int, int); 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_API int wolfSSL_BIO_new_bio_pair(WOLFSSL_BIO**, size_t,
WOLFSSL_BIO**, size_t); WOLFSSL_BIO**, size_t);