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

Merge pull request #2533 from cariepointer/apache_bio_want_read

Browse Source 
Apache: Return WANT_READ in wolfSSLReceive if BIO retry and read flags are set
This commit is contained in:
toddouska
2019-11-04 16:52:28 -08:00
committed by GitHub
parent 5141623f48 e8db4cc2a0
commit e2b7bee9c8
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal.c
View File

@@ -7426,6 +7426,15 @@ retry:
if (recvd < 0) {
switch (recvd) {
case WOLFSSL_CBIO_ERR_GENERAL: /* general/unknown error */
#if defined(OPENSSL_ALL) || defined(WOLFSSL_APACHE_HTTPD)
if (ssl->biord) {
/* If retry and read flags are set, return WANT_READ */
if ((ssl->biord->flags & WOLFSSL_BIO_FLAG_READ) &&
(ssl->biord->flags & WOLFSSL_BIO_FLAG_RETRY)) {
return WANT_READ;
}
}
#endif
return -1;
case WOLFSSL_CBIO_ERR_WANT_READ: /* want read, would block */

11
src/ssl.c
View File

@@ -43723,6 +43723,7 @@ static int bio_get_data(WOLFSSL_BIO* bio, byte** data)
return ret;
}
#ifndef NO_WOLFSSL_STUB
void wolfSSL_BIO_set_init(WOLFSSL_BIO* bio, int init)
{
WOLFSSL_STUB("wolfSSL_BIO_set_init");
@@ -43743,12 +43744,14 @@ int wolfSSL_BIO_get_shutdown(WOLFSSL_BIO* bio)
(void)bio;
return 0;
}
#endif /* NO_WOLFSSL_STUB */
int wolfSSL_BIO_clear_retry_flags(WOLFSSL_BIO* bio)
void wolfSSL_BIO_clear_retry_flags(WOLFSSL_BIO* bio)
{
WOLFSSL_STUB("wolfSSL_BIO_clear_retry_flags");
(void)bio;
return 0;
WOLFSSL_ENTER("wolfSSL_BIO_clear_retry_flags");
if (bio)
bio->flags &= ~(WOLFSSL_BIO_FLAG_READ|WOLFSSL_BIO_FLAG_RETRY);
}
/* DER data is PKCS#8 encrypted. */

2
wolfssl/ssl.h
View File

@@ -1156,7 +1156,7 @@ WOLFSSL_API void wolfSSL_BIO_set_data(WOLFSSL_BIO*, void*);
WOLFSSL_API void* wolfSSL_BIO_get_data(WOLFSSL_BIO*);
WOLFSSL_API void wolfSSL_BIO_set_shutdown(WOLFSSL_BIO*, int);
WOLFSSL_API int wolfSSL_BIO_get_shutdown(WOLFSSL_BIO*);
WOLFSSL_API int wolfSSL_BIO_clear_retry_flags(WOLFSSL_BIO*);
WOLFSSL_API void wolfSSL_BIO_clear_retry_flags(WOLFSSL_BIO*);
WOLFSSL_API WOLFSSL_BIO_METHOD *wolfSSL_BIO_meth_new(int, const char*);
WOLFSSL_API void wolfSSL_BIO_meth_free(WOLFSSL_BIO_METHOD*);