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

Attempt wolfssl_read_bio_file in read_bio even when XFSEEK is available

Browse Source
This commit is contained in:
Lealem Amedie
2025-04-22 16:56:32 -06:00
parent f458930d24
commit 882eaa5df8
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ssl_misc.c
View File

@@ -30,7 +30,6 @@
#if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY) #if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY)
#ifndef NO_BIO #ifndef NO_BIO
#ifdef WOLFSSL_NO_FSEEK
/* Amount of memory to allocate/add. */ /* Amount of memory to allocate/add. */
#define READ_BIO_FILE_CHUNK 128 #define READ_BIO_FILE_CHUNK 128
@@ -109,7 +108,6 @@ static int wolfssl_read_bio_file(WOLFSSL_BIO* bio, char** data)
*data = mem; *data = mem;
return ret; return ret;
} }
#endif
/* Read exactly the required amount into a newly allocated buffer. /* Read exactly the required amount into a newly allocated buffer.
* *
@@ -171,15 +169,7 @@ static int wolfssl_read_bio(WOLFSSL_BIO* bio, char** data, int* dataSz,
} }
*memAlloced = 0; *memAlloced = 0;
} }
#ifndef WOLFSSL_NO_FSEEK
/* Get pending or, when a file BIO, get length of file. */ /* Get pending or, when a file BIO, get length of file. */
else if ((sz = wolfSSL_BIO_get_len(bio)) > 0) {
ret = wolfssl_read_bio_len(bio, sz, data);
if (ret > 0) {
*memAlloced = 1;
}
}
#else
else if ((sz = wolfSSL_BIO_pending(bio)) > 0) { else if ((sz = wolfSSL_BIO_pending(bio)) > 0) {
ret = wolfssl_read_bio_len(bio, sz, data); ret = wolfssl_read_bio_len(bio, sz, data);
if (ret > 0) { if (ret > 0) {
@@ -192,7 +182,6 @@ static int wolfssl_read_bio(WOLFSSL_BIO* bio, char** data, int* dataSz,
*memAlloced = 1; *memAlloced = 1;
} }
} }
#endif
else { else {
WOLFSSL_ERROR_MSG("No data read from bio"); WOLFSSL_ERROR_MSG("No data read from bio");
*memAlloced = 0; *memAlloced = 0;