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

Fix BioReceive for closed connection

Browse Source 
The pending check was forcing a `WOLFSSL_CBIO_ERR_WANT_WRITE` return even though the underlying socket was closed and `WOLFSSL_BIO_FLAG_READ|WOLFSSL_BIO_FLAG_RETRY` was not set. The `wolfSSL_BIO_ctrl_pending(ssl->biord) == 0` is old and I can't find a reason to keep checking it. I left it just in the case where there is output data pending.
This commit is contained in:
Juliusz Sosinowicz
2022-02-23 16:03:23 +01:00
parent 1aff4399d1
commit 645f385031
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wolfio.c
View File

@@ -169,16 +169,18 @@ int BioReceive(WOLFSSL* ssl, char* buf, int sz, void* ctx)
recvd = wolfSSL_BIO_read(ssl->biord, buf, sz); recvd = wolfSSL_BIO_read(ssl->biord, buf, sz);
if (recvd <= 0) { if (recvd <= 0) {
if (wolfSSL_BIO_supports_pending(ssl->biord) && if (/* ssl->biowr->wrIdx is checked for Bind9 */
ssl->biowr != NULL && ssl->biowr->type == WOLFSSL_BIO_BIO &&
ssl->biowr->wrIdx != 0 &&
/* Not sure this pending check is necessary but let's double
* check that the read BIO is empty before we signal a write
* need */
wolfSSL_BIO_supports_pending(ssl->biord) &&
wolfSSL_BIO_ctrl_pending(ssl->biord) == 0) { wolfSSL_BIO_ctrl_pending(ssl->biord) == 0) {
if (ssl->biowr->type == WOLFSSL_BIO_BIO &&
ssl->biowr->wrIdx != 0) {
/* Let's signal to the app layer that we have /* Let's signal to the app layer that we have
* data pending that needs to be sent. */ * data pending that needs to be sent. */
return WOLFSSL_CBIO_ERR_WANT_WRITE; return WOLFSSL_CBIO_ERR_WANT_WRITE;
} }
return WOLFSSL_CBIO_ERR_WANT_READ;
}
else if (ssl->biord->type == WOLFSSL_BIO_SOCKET) { else if (ssl->biord->type == WOLFSSL_BIO_SOCKET) {
if (recvd == 0) { if (recvd == 0) {
WOLFSSL_MSG("BioReceive connection closed"); WOLFSSL_MSG("BioReceive connection closed");