Merge pull request #1162 from cconlon/mysql_compat

wolfSSL_ERR_peek_error() with WOLFSSL_MYSQL_COMPATIBLE
This commit is contained in:
JacobBarthelmeh
2017-09-28 09:51:07 -06:00
committed by GitHub
3 changed files with 6 additions and 3 deletions

View File

@@ -24900,7 +24900,8 @@ unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, int *line,
*flags = 0; *flags = 0;
} }
#if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) || \
defined(WOLFSSL_MYSQL_COMPATIBLE)
{ {
int ret = 0; int ret = 0;

View File

@@ -303,7 +303,8 @@ int wc_LoggingCleanup(void)
} }
#if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) #if defined(DEBUG_WOLFSSL) || defined(WOLFSSL_NGINX) || \
defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_MYSQL_COMPATIBLE)
/* peek at an error node /* peek at an error node
* *
* idx : if -1 then the most recent node is looked at, otherwise search * idx : if -1 then the most recent node is looked at, otherwise search

View File

@@ -721,7 +721,8 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING;
#define NID_tlsfeature 92 /* id-pe 24 */ #define NID_tlsfeature 92 /* id-pe 24 */
#if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) #if defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) || \
defined(WOLFSSL_MYSQL_COMPATIBLE)
#include <wolfssl/error-ssl.h> #include <wolfssl/error-ssl.h>