Merge pull request #4044 from julek-wolfssl/ZD12270

Check for XREAD when XFREAD fails
This commit is contained in:
Sean Parkinson
2021-06-09 09:48:25 +10:00
committed by GitHub

View File

@@ -230,15 +230,15 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
if (bio->ptr) { if (bio->ptr) {
ret = (int)XFREAD(buf, 1, len, (XFILE)bio->ptr); ret = (int)XFREAD(buf, 1, len, (XFILE)bio->ptr);
} }
else {
#if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR) && \ #if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR) && \
!defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2) !defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2)
else {
ret = (int)XREAD(bio->num, buf, len); ret = (int)XREAD(bio->num, buf, len);
}
#else #else
WOLFSSL_MSG("No file pointer and XREAD not enabled"); WOLFSSL_MSG("No file pointer and XREAD not enabled");
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;
#endif #endif
}
#else #else
WOLFSSL_MSG("WOLFSSL_BIO_FILE used with NO_FILESYSTEM"); WOLFSSL_MSG("WOLFSSL_BIO_FILE used with NO_FILESYSTEM");
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;