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

Merge pull request #1888 from MJSPollard/nidFIX

Browse Source 
Fixed compilation issues with Asio, Websocket++, and HAProxy
This commit is contained in:
Chris Conlon
2018-10-22 10:19:05 -06:00
committed by GitHub
parent 84fb23cfab fac6ce794d
commit 96abf43238
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfssl/openssl/ssl.h
View File

@@ -40,6 +40,10 @@
#include <wolfssl/openssl/crypto.h> #include <wolfssl/openssl/crypto.h>
#endif #endif
#if defined(WOLFSSL_ASIO) || defined(WOLFSSL_HAPROXY)
#include <wolfssl/wolfcrypt/asn.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -913,8 +917,9 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING;
#define X509_NAME_ENTRY_get_object wolfSSL_X509_NAME_ENTRY_get_object #define X509_NAME_ENTRY_get_object wolfSSL_X509_NAME_ENTRY_get_object
#define SSL_get_SSL_CTX wolfSSL_get_SSL_CTX #define SSL_get_SSL_CTX wolfSSL_get_SSL_CTX
#define ERR_peek_last_error wolfSSL_ERR_peek_last_error #define ERR_peek_last_error wolfSSL_ERR_peek_last_error
#ifndef WOLFSSL_HAPROXY
#define X509_get_version wolfSSL_X509_get_version #define X509_get_version wolfSSL_X509_get_version
#endif
#define ERR_NUM_ERRORS 16 #define ERR_NUM_ERRORS 16
#define EVP_PKEY_RSA 6 #define EVP_PKEY_RSA 6