wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 02:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename enum to protect the innocent

Browse Source 
WC_NO_PENDING_E indicates that there really isn't any asynchronous task that is pending.
This commit is contained in:
Andras Fekete
2023-09-15 15:16:51 -04:00
parent c12bf79e56
commit 2af5ae89a2
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/internal.c
View File

@ -13696,7 +13696,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
args = (ProcPeerCertArgs*)ssl->async->args;
#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_ppc;
@ -13708,7 +13708,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
/* Re-entry after non-blocking OCSP */
#ifdef WOLFSSL_ASYNC_CRYPT
/* if async operationg not pending, reset error code */
if (ret == WC_NOT_PENDING_E)
if (ret == WC_NO_PENDING_E)
ret = 0;
#endif
}
@ -18709,7 +18709,7 @@ static int DecryptTls(WOLFSSL* ssl, byte* plain, const byte* input, word16 sz)
#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* check for still pending */
if (ret == WC_PENDING_E)
return ret;
@ -21656,7 +21656,7 @@ int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
#endif
#ifdef WOLFSSL_ASYNC_CRYPT
ret = WC_NOT_PENDING_E;
ret = WC_NO_PENDING_E;
if (asyncOkay) {
if (ssl->async == NULL) {
return BAD_FUNC_ARG;
@ -21664,7 +21664,7 @@ int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
args = &ssl->async->buildArgs;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.buildMsgState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_buildmsg;
@ -21678,7 +21678,7 @@ int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
/* Reset state */
#ifdef WOLFSSL_ASYNC_CRYPT
if (ret == WC_NOT_PENDING_E)
if (ret == WC_NO_PENDING_E)
#endif
{
ret = 0;
@ -29017,7 +29017,7 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
args = (DskeArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_dske;
@ -30100,7 +30100,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_scke;
@ -31369,7 +31369,7 @@ int SendCertificateVerify(WOLFSSL* ssl)
if (ssl->error != WC_PENDING_E ||
ssl->options.asyncState != TLS_ASYNC_END)
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_scv;
@ -32460,7 +32460,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
args = (SskeArgs*)ssl->async->args;
#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_sske;
@ -35312,7 +35312,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
args = (DcvArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_dcv;
@ -37464,7 +37464,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
args = (DckeArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_dcke;
@ -38730,7 +38730,7 @@ int wolfSSL_AsyncPop(WOLFSSL* ssl, byte* state)
event = &asyncDev->event;
ret = wolfAsync_EventPop(event, WOLF_EVENT_TYPE_ASYNC_WOLFSSL);
if (ret != WC_NOT_PENDING_E && ret != WC_PENDING_E) {
if (ret != WC_NO_PENDING_E && ret != WC_PENDING_E) {
/* advance key share state if doesn't need called again */
if (state && (asyncDev->event.flags & WC_ASYNC_FLAG_CALL_AGAIN) == 0) {
@ -38745,7 +38745,7 @@ int wolfSSL_AsyncPop(WOLFSSL* ssl, byte* state)
}
}
else {
ret = WC_NOT_PENDING_E;
ret = WC_NO_PENDING_E;
}
WOLFSSL_LEAVE("wolfSSL_AsyncPop", ret);

4
src/sniffer.c
View File

@ -2474,7 +2474,7 @@ static int SetupKeys(const byte* input, int* sslBytes, SnifferSession* session,
args = (SetupKeysArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_sk;
@ -4877,7 +4877,7 @@ static int DecryptTls(WOLFSSL* ssl, byte* plain, const byte* input,
#ifdef WOLFSSL_ASYNC_CRYPT
if (ssl->decrypt.state != CIPHER_STATE_BEGIN) {
ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* check for still pending */
if (ret == WC_PENDING_E)
return ret;

2
src/tls.c
View File

@ -9669,7 +9669,7 @@ int TLSX_KeyShare_DeriveSecret(WOLFSSL *ssl)
#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, NULL);
/* Check for error */
if (ret != WC_NOT_PENDING_E && ret < 0) {
if (ret != WC_NO_PENDING_E && ret < 0) {
return ret;
}
#endif

20
src/tls13.c
View File

@ -2945,7 +2945,7 @@ int DecryptTls13(WOLFSSL* ssl, byte* output, const byte* input, word16 sz,
#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* check for still pending */
if (ret == WC_PENDING_E)
return ret;
@ -3208,7 +3208,7 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
WOLFSSL_ENTER("BuildTls13Message");
#ifdef WOLFSSL_ASYNC_CRYPT
ret = WC_NOT_PENDING_E;
ret = WC_NO_PENDING_E;
if (asyncOkay) {
WOLFSSL_ASSERT_SIZEOF_GE(ssl->async->args, *args);
@ -3222,7 +3222,7 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
args = (BuildMsg13Args*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.buildMsgState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_buildmsg;
@ -3236,7 +3236,7 @@ int BuildTls13Message(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
/* Reset state */
#ifdef WOLFSSL_ASYNC_CRYPT
if (ret == WC_NOT_PENDING_E)
if (ret == WC_NO_PENDING_E)
#endif
{
ret = 0;
@ -4285,7 +4285,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
args = (Sch13Args*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
return ret;
@ -4995,7 +4995,7 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
args = (Dsh13Args*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0) {
if (ret == WC_PENDING_E) {
@ -6608,7 +6608,7 @@ int DoTls13ClientHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
args = (Dch13Args*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0) {
goto exit_dch;
@ -8512,7 +8512,7 @@ static int SendTls13CertificateVerify(WOLFSSL* ssl)
args = (Scv13Args*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_scv;
@ -9141,7 +9141,7 @@ static int DoTls13CertificateVerify(WOLFSSL* ssl, byte* input,
args = (Dcv13Args*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
goto exit_dcv;
@ -12341,7 +12341,7 @@ int wolfSSL_UseKeyShare(WOLFSSL* ssl, word16 group)
#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, NULL);
if (ret != WC_NOT_PENDING_E) {
if (ret != WC_NO_PENDING_E) {
/* Check for error */
if (ret < 0)
return ret;

2
wolfcrypt/src/error.c
View File

@ -63,7 +63,7 @@ const char* wc_GetErrorString(int error)
case WC_PENDING_E:
return "wolfCrypt Operation Pending (would block / eagain) error";
case WC_NOT_PENDING_E:
case WC_NO_PENDING_E:
return "wolfCrypt operation not pending error";
case MP_INIT_E :