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

Cleanup to use WANT_READ instead of async WC_PENDING_E for non-blocking OCSP and CRL.

Browse Source
This commit is contained in:
David Garske
2017-06-02 10:35:26 -07:00
parent b3a85bc2c7
commit c55575665f
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crl.c
View File

@@ -350,7 +350,7 @@ int CheckCertCRL(WOLFSSL_CRL* crl, DecodedCert* cert)
ret = crl->crlIOCb(crl, (const char*)cert->extCrlInfo, ret = crl->crlIOCb(crl, (const char*)cert->extCrlInfo,
cert->extCrlInfoSz); cert->extCrlInfoSz);
if (ret == WOLFSSL_CBIO_ERR_WANT_READ) { if (ret == WOLFSSL_CBIO_ERR_WANT_READ) {
ret = WC_PENDING_E; ret = WANT_READ;
} }
else if (ret >= 0) { else if (ret >= 0) {
/* try again */ /* try again */

16
src/internal.c
View File

@@ -7693,8 +7693,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz
ret = CheckCertOCSP(ssl->ctx->cm->ocsp, args->dCert, ret = CheckCertOCSP(ssl->ctx->cm->ocsp, args->dCert,
NULL); NULL);
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
/* Handle WC_PENDING_E */ /* non-blocking socket re-entry requires async */
if (ret == WC_PENDING_E) { if (ret == WANT_READ) {
goto exit_ppc; goto exit_ppc;
} }
#endif #endif
@@ -7713,7 +7713,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz
WOLFSSL_MSG("Doing Non Leaf CRL check"); WOLFSSL_MSG("Doing Non Leaf CRL check");
ret = CheckCertCRL(ssl->ctx->cm->crl, args->dCert); ret = CheckCertCRL(ssl->ctx->cm->crl, args->dCert);
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
if (ret == WC_PENDING_E) { /* non-blocking socket re-entry requires async */
if (ret == WANT_READ) {
goto exit_ppc; goto exit_ppc;
} }
#endif #endif
@@ -7859,7 +7860,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz
ret = CheckCertOCSP(ssl->ctx->cm->ocsp, args->dCert, ret = CheckCertOCSP(ssl->ctx->cm->ocsp, args->dCert,
NULL); NULL);
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
if (ret == WC_PENDING_E) { /* non-blocking socket re-entry requires async */
if (ret == WANT_READ) {
goto exit_ppc; goto exit_ppc;
} }
#endif #endif
@@ -7879,7 +7881,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz
WOLFSSL_MSG("Doing Leaf CRL check"); WOLFSSL_MSG("Doing Leaf CRL check");
ret = CheckCertCRL(ssl->ctx->cm->crl, args->dCert); ret = CheckCertCRL(ssl->ctx->cm->crl, args->dCert);
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
if (ret == WC_PENDING_E) { /* non-blocking socket re-entry requires async */
if (ret == WANT_READ) {
goto exit_ppc; goto exit_ppc;
} }
#endif #endif
@@ -8289,8 +8292,7 @@ exit_ppc:
WOLFSSL_LEAVE("ProcessPeerCerts", ret); WOLFSSL_LEAVE("ProcessPeerCerts", ret);
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
/* Handle WC_PENDING_E */ if (ret == WC_PENDING_E || ret == WANT_READ) {
if (ret == WC_PENDING_E) {
/* Mark message as not recevied so it can process again */ /* Mark message as not recevied so it can process again */
ssl->msgsReceived.got_certificate = 0; ssl->msgsReceived.got_certificate = 0;

2
src/ocsp.c
View File

@@ -446,7 +446,7 @@ int CheckOcspRequest(WOLFSSL_OCSP* ocsp, OcspRequest* ocspRequest,
request, requestSz, &response); request, requestSz, &response);
} }
if (responseSz == WOLFSSL_CBIO_ERR_WANT_READ) { if (responseSz == WOLFSSL_CBIO_ERR_WANT_READ) {
ret = WC_PENDING_E; ret = WANT_READ;
} }
XFREE(request, ocsp->cm->heap, DYNAMIC_TYPE_OCSP); XFREE(request, ocsp->cm->heap, DYNAMIC_TYPE_OCSP);