diff --git a/wolfssl/openssl/crypto.h b/wolfssl/openssl/crypto.h index 2267c09b3..bb4d800d9 100644 --- a/wolfssl/openssl/crypto.h +++ b/wolfssl/openssl/crypto.h @@ -48,7 +48,7 @@ WOLFSSL_API unsigned long wolfSSLeay(void); /* this function was used to set the default malloc, free, and realloc */ #define CRYPTO_malloc_init() /* CRYPTO_malloc_init is not needed */ -#if defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || defined(HAPROXY) +#if defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) #define CRYPTO_set_mem_ex_functions wolfSSL_CRYPTO_set_mem_ex_functions #define FIPS_mode wolfSSL_FIPS_mode #define FIPS_mode_set wolfSSL_FIPS_mode_set diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index def44c15d..3048bbdf2 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -554,6 +554,7 @@ typedef WOLFSSL_X509_NAME_ENTRY X509_NAME_ENTRY; #define X509_check_private_key wolfSSL_X509_check_private_key #define SSL_dup_CA_list wolfSSL_dup_CA_list + #define NID_commonName 0x03 /* matchs ASN_COMMON_NAME in asn.h */ /* matchs ASN_..._NAME in asn.h */ @@ -586,7 +587,6 @@ enum { #define PEM_write_bio_X509_REQ wolfSSL_PEM_write_bio_X509_REQ #define PEM_write_bio_X509_AUX wolfSSL_PEM_write_bio_X509_AUX - #ifdef WOLFSSL_HAPROXY #define SSL_get_rbio wolfSSL_SSL_get_rbio #define SSL_get_wbio wolfSSL_SSL_get_wbio