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

make NID values avaliable with OPENSSL_EXTRA build

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-05-12 13:46:05 -06:00
parent 4d9675bebe
commit cecdd50eab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfssl/openssl/crypto.h
View File

@ -48,7 +48,7 @@ WOLFSSL_API unsigned long wolfSSLeay(void);
/* this function was used to set the default malloc, free, and realloc */ /* this function was used to set the default malloc, free, and realloc */
#define CRYPTO_malloc_init() /* CRYPTO_malloc_init is not needed */ #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 CRYPTO_set_mem_ex_functions wolfSSL_CRYPTO_set_mem_ex_functions
#define FIPS_mode wolfSSL_FIPS_mode #define FIPS_mode wolfSSL_FIPS_mode
#define FIPS_mode_set wolfSSL_FIPS_mode_set #define FIPS_mode_set wolfSSL_FIPS_mode_set

2
wolfssl/openssl/ssl.h
View File

@ -554,6 +554,7 @@ typedef WOLFSSL_X509_NAME_ENTRY X509_NAME_ENTRY;
#define X509_check_private_key wolfSSL_X509_check_private_key #define X509_check_private_key wolfSSL_X509_check_private_key
#define SSL_dup_CA_list wolfSSL_dup_CA_list #define SSL_dup_CA_list wolfSSL_dup_CA_list
#define NID_commonName 0x03 /* matchs ASN_COMMON_NAME in asn.h */ #define NID_commonName 0x03 /* matchs ASN_COMMON_NAME in asn.h */
/* matchs ASN_..._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_REQ wolfSSL_PEM_write_bio_X509_REQ
#define PEM_write_bio_X509_AUX wolfSSL_PEM_write_bio_X509_AUX #define PEM_write_bio_X509_AUX wolfSSL_PEM_write_bio_X509_AUX
#ifdef WOLFSSL_HAPROXY #ifdef WOLFSSL_HAPROXY
#define SSL_get_rbio wolfSSL_SSL_get_rbio #define SSL_get_rbio wolfSSL_SSL_get_rbio
#define SSL_get_wbio wolfSSL_SSL_get_wbio #define SSL_get_wbio wolfSSL_SSL_get_wbio