wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5176 from embhorn/zd14227

Browse Source 
Fix to move wolfSSL_ERR_clear_error outside gate for OPENSSL_EXTRA
This commit is contained in:
David Garske
2022-05-26 08:33:52 -07:00
committed by GitHub
parent ea895e99b7 2800d00bb4
commit 0b6f7c1533
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ssl.c
View File

@ -17766,14 +17766,6 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return ret; return ret;
} }
void wolfSSL_ERR_clear_error(void)
{
WOLFSSL_ENTER("wolfSSL_ERR_clear_error");
#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
wc_ClearErrorNodes();
#endif
}
#ifndef NO_DES3 #ifndef NO_DES3
/* 0 on ok */ /* 0 on ok */
int wolfSSL_DES_key_sched(WOLFSSL_const_DES_cblock* key, int wolfSSL_DES_key_sched(WOLFSSL_const_DES_cblock* key,
@ -18028,6 +18020,14 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
void wolfSSL_ERR_clear_error(void)
{
WOLFSSL_ENTER("wolfSSL_ERR_clear_error");
wc_ClearErrorNodes();
}
#endif
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) #if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
int wolfSSL_clear(WOLFSSL* ssl) int wolfSSL_clear(WOLFSSL* ssl)
{ {

2
wolfssl/internal.h
View File

@ -4656,7 +4656,7 @@ struct WOLFSSL {
* to the error queue on file end. This should not be left * to the error queue on file end. This should not be left
* for the caller to find so we clear the last error. * for the caller to find so we clear the last error.
*/ */
#ifdef WOLFSSL_HAVE_ERROR_QUEUE #if defined(OPENSSL_EXTRA) && defined(WOLFSSL_HAVE_ERROR_QUEUE)
#define CLEAR_ASN_NO_PEM_HEADER_ERROR(err) \ #define CLEAR_ASN_NO_PEM_HEADER_ERROR(err) \
(err) = wolfSSL_ERR_peek_last_error(); \ (err) = wolfSSL_ERR_peek_last_error(); \
if (ERR_GET_LIB(err) == ERR_LIB_PEM && \ if (ERR_GET_LIB(err) == ERR_LIB_PEM && \