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 #6789 from bandi13/renameAsyncEnumPart2

Browse Source 
Clean up double enum
This commit is contained in:
David Garske
2023-09-19 09:08:32 -07:00
committed by GitHub
parent ba74c83f73 2af5ae89a2
commit eca28ea2f6
6 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/internal.c
View File

@@ -13698,7 +13698,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
args = (ProcPeerCertArgs*)ssl->async->args; args = (ProcPeerCertArgs*)ssl->async->args;
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_ppc; goto exit_ppc;
@@ -13710,7 +13710,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
/* Re-entry after non-blocking OCSP */ /* Re-entry after non-blocking OCSP */
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
/* if async operationg not pending, reset error code */ /* if async operationg not pending, reset error code */
if (ret == WC_NOT_PENDING_E) if (ret == WC_NO_PENDING_E)
ret = 0; ret = 0;
#endif #endif
} }
@@ -18711,7 +18711,7 @@ static int DecryptTls(WOLFSSL* ssl, byte* plain, const byte* input, word16 sz)
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state); ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* check for still pending */ /* check for still pending */
if (ret == WC_PENDING_E) if (ret == WC_PENDING_E)
return ret; return ret;
@@ -21658,7 +21658,7 @@ int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
#endif #endif
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
ret = WC_NOT_PENDING_E; ret = WC_NO_PENDING_E;
if (asyncOkay) { if (asyncOkay) {
if (ssl->async == NULL) { if (ssl->async == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -21666,7 +21666,7 @@ int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
args = &ssl->async->buildArgs; args = &ssl->async->buildArgs;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.buildMsgState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.buildMsgState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_buildmsg; goto exit_buildmsg;
@@ -21680,7 +21680,7 @@ int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
/* Reset state */ /* Reset state */
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
if (ret == WC_NOT_PENDING_E) if (ret == WC_NO_PENDING_E)
#endif #endif
{ {
ret = 0; ret = 0;
@@ -29019,7 +29019,7 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
args = (DskeArgs*)ssl->async->args; args = (DskeArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_dske; goto exit_dske;
@@ -30102,7 +30102,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_scke; goto exit_scke;
@@ -31371,7 +31371,7 @@ int SendCertificateVerify(WOLFSSL* ssl)
if (ssl->error != WC_PENDING_E || if (ssl->error != WC_PENDING_E ||
ssl->options.asyncState != TLS_ASYNC_END) ssl->options.asyncState != TLS_ASYNC_END)
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_scv; goto exit_scv;
@@ -32462,7 +32462,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
args = (SskeArgs*)ssl->async->args; args = (SskeArgs*)ssl->async->args;
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_sske; goto exit_sske;
@@ -35314,7 +35314,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
args = (DcvArgs*)ssl->async->args; args = (DcvArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_dcv; goto exit_dcv;
@@ -37466,7 +37466,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
args = (DckeArgs*)ssl->async->args; args = (DckeArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_dcke; goto exit_dcke;
@@ -38732,7 +38732,7 @@ int wolfSSL_AsyncPop(WOLFSSL* ssl, byte* state)
event = &asyncDev->event; event = &asyncDev->event;
ret = wolfAsync_EventPop(event, WOLF_EVENT_TYPE_ASYNC_WOLFSSL); 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 */ /* advance key share state if doesn't need called again */
if (state && (asyncDev->event.flags & WC_ASYNC_FLAG_CALL_AGAIN) == 0) { if (state && (asyncDev->event.flags & WC_ASYNC_FLAG_CALL_AGAIN) == 0) {
@@ -38747,7 +38747,7 @@ int wolfSSL_AsyncPop(WOLFSSL* ssl, byte* state)
} }
} }
else { else {
ret = WC_NOT_PENDING_E; ret = WC_NO_PENDING_E;
} }
WOLFSSL_LEAVE("wolfSSL_AsyncPop", ret); 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; args = (SetupKeysArgs*)ssl->async->args;
ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState); ret = wolfSSL_AsyncPop(ssl, &ssl->options.asyncState);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* Check for error */ /* Check for error */
if (ret < 0) if (ret < 0)
goto exit_sk; goto exit_sk;
@@ -4877,7 +4877,7 @@ static int DecryptTls(WOLFSSL* ssl, byte* plain, const byte* input,
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
if (ssl->decrypt.state != CIPHER_STATE_BEGIN) { if (ssl->decrypt.state != CIPHER_STATE_BEGIN) {
ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state); ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state);
if (ret != WC_NOT_PENDING_E) { if (ret != WC_NO_PENDING_E) {
/* check for still pending */ /* check for still pending */
if (ret == WC_PENDING_E) if (ret == WC_PENDING_E)
return ret; return ret;

2
src/tls.c
View File

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

2
wolfcrypt/src/error.c
View File

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

3
wolfssl/wolfcrypt/error-crypt.h
View File

@@ -49,8 +49,7 @@ enum {
BAD_MUTEX_E = -106, /* Bad mutex operation */ BAD_MUTEX_E = -106, /* Bad mutex operation */
WC_TIMEOUT_E = -107, /* timeout error */ WC_TIMEOUT_E = -107, /* timeout error */
WC_PENDING_E = -108, /* wolfCrypt operation pending (would block) */ WC_PENDING_E = -108, /* wolfCrypt operation pending (would block) */
WC_NOT_PENDING_E = -109, /* wolfCrypt operation not pending */ WC_NO_PENDING_E = -109, /* no asynchronous operation pending */
WC_NO_PENDING_E = -109, /* no asynchronous operation not pending */
MP_INIT_E = -110, /* mp_init error state */ MP_INIT_E = -110, /* mp_init error state */
MP_READ_E = -111, /* mp_read error state */ MP_READ_E = -111, /* mp_read error state */