wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reduce openssl verbosity in BIO due to PEM_X509_INFO_read_bio reading 1 byte at a time. Remove duplicate PEM_X509_INFO_read_bio macro. (#4428)

Browse Source
This commit is contained in:
David Garske
2021-09-27 15:21:23 -07:00
committed by GitHub
parent 943c98a45e
commit 847b8f9a1f
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/bio.c
View File

@@ -81,8 +81,14 @@ static int wolfSSL_BIO_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
*/ */
static int wolfSSL_BIO_MEMORY_read(WOLFSSL_BIO* bio, void* buf, int len) static int wolfSSL_BIO_MEMORY_read(WOLFSSL_BIO* bio, void* buf, int len)
{ {
int sz; int sz;
#ifndef WOLFSSL_DEBUG_OPENSSL
if (len > 1)
#endif
{
WOLFSSL_ENTER("wolfSSL_BIO_MEMORY_read"); WOLFSSL_ENTER("wolfSSL_BIO_MEMORY_read");
}
sz = wolfSSL_BIO_pending(bio); sz = wolfSSL_BIO_pending(bio);
if (sz > 0) { if (sz > 0) {
@@ -195,7 +201,12 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
WOLFSSL_BIO* front = bio; WOLFSSL_BIO* front = bio;
int sz = 0; int sz = 0;
#ifndef WOLFSSL_DEBUG_OPENSSL
if (len > 1)
#endif
{
WOLFSSL_ENTER("wolfSSL_BIO_read"); WOLFSSL_ENTER("wolfSSL_BIO_read");
}
/* info cb, abort if user returns <= 0*/ /* info cb, abort if user returns <= 0*/
if (front != NULL && front->infoCb != NULL) { if (front != NULL && front->infoCb != NULL) {
@@ -1037,7 +1048,10 @@ int wolfSSL_BIO_supports_pending(const WOLFSSL_BIO *bio)
/* Return the number of pending bytes in read and write buffers */ /* Return the number of pending bytes in read and write buffers */
size_t wolfSSL_BIO_ctrl_pending(WOLFSSL_BIO *bio) size_t wolfSSL_BIO_ctrl_pending(WOLFSSL_BIO *bio)
{ {
#ifdef WOLFSSL_DEBUG_OPENSSL
WOLFSSL_ENTER("wolfSSL_BIO_ctrl_pending"); WOLFSSL_ENTER("wolfSSL_BIO_ctrl_pending");
#endif
if (bio == NULL) { if (bio == NULL) {
return 0; return 0;
} }
@@ -1840,7 +1854,10 @@ int wolfSSL_BIO_meth_set_destroy(WOLFSSL_BIO_METHOD *biom,
int wolfSSL_BIO_get_mem_data(WOLFSSL_BIO* bio, void* p) int wolfSSL_BIO_get_mem_data(WOLFSSL_BIO* bio, void* p)
{ {
WOLFSSL_BIO* mem_bio; WOLFSSL_BIO* mem_bio;
#ifdef WOLFSSL_DEBUG_OPENSSL
WOLFSSL_ENTER("wolfSSL_BIO_get_mem_data"); WOLFSSL_ENTER("wolfSSL_BIO_get_mem_data");
#endif
if (bio == NULL) if (bio == NULL)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;

1
wolfssl/openssl/ssl.h
View File

@@ -409,7 +409,6 @@ typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
#define PEM_read_bio_X509_CRL wolfSSL_PEM_read_bio_X509_CRL #define PEM_read_bio_X509_CRL wolfSSL_PEM_read_bio_X509_CRL
#define PEM_read_bio_X509_AUX wolfSSL_PEM_read_bio_X509_AUX #define PEM_read_bio_X509_AUX wolfSSL_PEM_read_bio_X509_AUX
#define PEM_read_X509 wolfSSL_PEM_read_X509 #define PEM_read_X509 wolfSSL_PEM_read_X509
#define PEM_X509_INFO_read_bio wolfSSL_PEM_X509_INFO_read_bio
#define PEM_write_bio_X509 wolfSSL_PEM_write_bio_X509 #define PEM_write_bio_X509 wolfSSL_PEM_write_bio_X509
#define PEM_write_bio_X509_AUX wolfSSL_PEM_write_bio_X509_AUX #define PEM_write_bio_X509_AUX wolfSSL_PEM_write_bio_X509_AUX
#define PEM_X509_INFO_read_bio wolfSSL_PEM_X509_INFO_read_bio #define PEM_X509_INFO_read_bio wolfSSL_PEM_X509_INFO_read_bio