From 12c2cdafaf92d210967aae2ca5855f90457333cf Mon Sep 17 00:00:00 2001 From: Marco Oliverio Date: Thu, 18 Dec 2025 16:52:58 +0100 Subject: [PATCH] rename wolfSSL_MaybeCheckAlertOnErr in wolfMaybeCheckAlertOnErr --- src/internal.c | 2 +- src/ssl.c | 28 ++++++++++++++-------------- src/tls13.c | 6 +++--- wolfssl/internal.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/internal.c b/src/internal.c index 0b102054f..4a514a4a0 100644 --- a/src/internal.c +++ b/src/internal.c @@ -42514,7 +42514,7 @@ int wolfSSL_TestAppleNativeCertValidation_AppendCA(WOLFSSL_CTX* ctx, #endif /* defined(__APPLE__) && defined(WOLFSSL_SYS_CA_CERTS) */ /* Do not try to process error for async, non blocking io, and app_read */ -void wolfSSL_MaybeCheckAlertOnErr(WOLFSSL* ssl, int err) +void wolfMaybeCheckAlertOnErr(WOLFSSL* ssl, int err) { #if defined(WOLFSSL_CHECK_ALERT_ON_ERR) #if defined(WOLFSSL_ASYNC_CRYPT) diff --git a/src/ssl.c b/src/ssl.c index 03d321c18..f87086d9b 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -10591,7 +10591,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #endif if (ssl->options.sendVerify) { if ( (ssl->error = SendCertificate(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -10610,7 +10610,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #endif if (!ssl->options.resuming) { if ( (ssl->error = SendClientKeyExchange(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); #ifdef WOLFSSL_EXTRA_ALERTS if (ssl->error == WC_NO_ERR_TRACE(NO_PEER_KEY) || ssl->error == WC_NO_ERR_TRACE(PSK_KEY_ERROR)) { @@ -10639,7 +10639,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #if !defined(NO_CERTS) && !defined(WOLFSSL_NO_CLIENT_AUTH) if (ssl->options.sendVerify) { if ( (ssl->error = SendCertificateVerify(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -10652,7 +10652,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case FIRST_REPLY_THIRD : if ( (ssl->error = SendChangeCipher(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -10663,7 +10663,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case FIRST_REPLY_FOURTH : if ( (ssl->error = SendFinished(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11041,7 +11041,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, return WOLFSSL_FATAL_ERROR; } if ( (ssl->error = SendServerHello(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11058,7 +11058,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #ifndef NO_CERTS if (!ssl->options.resuming) if ( (ssl->error = SendCertificate(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11071,7 +11071,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #ifndef NO_CERTS if (!ssl->options.resuming) if ( (ssl->error = SendCertificateStatus(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11088,7 +11088,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #endif if (!ssl->options.resuming) if ( (ssl->error = SendServerKeyExchange(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11101,7 +11101,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, if (!ssl->options.resuming) { if (ssl->options.verifyPeer) { if ( (ssl->error = SendCertificateRequest(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11119,7 +11119,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case CERT_REQ_SENT : if (!ssl->options.resuming) if ( (ssl->error = SendServerHelloDone(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11158,7 +11158,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, #ifdef HAVE_SESSION_TICKET if (ssl->options.createTicket && !ssl->options.noTicketTls12) { if ( (ssl->error = SendTicket(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_MSG("Thought we need ticket but failed"); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; @@ -11177,7 +11177,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, } if ( (ssl->error = SendChangeCipher(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -11187,7 +11187,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl, case CHANGE_CIPHER_SENT : if ( (ssl->error = SendFinished(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } diff --git a/src/tls13.c b/src/tls13.c index e28150853..01c8cc13d 100644 --- a/src/tls13.c +++ b/src/tls13.c @@ -13548,7 +13548,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) if (!ssl->options.resuming && ssl->options.sendVerify) { ssl->error = SendTls13Certificate(ssl); if (ssl->error != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -13568,7 +13568,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) if (!ssl->options.resuming && ssl->options.sendVerify) { ssl->error = SendTls13CertificateVerify(ssl); if (ssl->error != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } @@ -13582,7 +13582,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl) case FIRST_REPLY_FOURTH: if ((ssl->error = SendTls13Finished(ssl)) != 0) { - wolfSSL_MaybeCheckAlertOnErr(ssl, ssl->error); + wolfMaybeCheckAlertOnErr(ssl, ssl->error); WOLFSSL_ERROR(ssl->error); return WOLFSSL_FATAL_ERROR; } diff --git a/wolfssl/internal.h b/wolfssl/internal.h index acd53111d..7a7750134 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -7240,7 +7240,7 @@ WOLFSSL_LOCAL int pkcs8_encrypt(WOLFSSL_EVP_PKEY* pkey, word32* keySz); #endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */ -WOLFSSL_LOCAL void wolfSSL_MaybeCheckAlertOnErr(WOLFSSL* ssl, int err); +WOLFSSL_LOCAL void wolfMaybeCheckAlertOnErr(WOLFSSL* ssl, int err); #ifdef __cplusplus } /* extern "C" */