Skip to content

Commit 14b1247

Browse files
rizlikrizlik
committed
use wolfssl internal prefix for MaybeCheckAlertOnErr
1 parent 12c2cda commit 14b1247

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎src/internal.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42514,7 +42514,7 @@ int wolfSSL_TestAppleNativeCertValidation_AppendCA(WOLFSSL_CTX* ctx,
4251442514
#endif /* defined(__APPLE__) && defined(WOLFSSL_SYS_CA_CERTS) */
4251542515

4251642516
/* Do not try to process error for async, non blocking io, and app_read */
42517-
void wolfMaybeCheckAlertOnErr(WOLFSSL* ssl, int err)
42517+
void wolfssl_i_MaybeCheckAlertOnErr(WOLFSSL* ssl, int err)
4251842518
{
4251942519
#if defined(WOLFSSL_CHECK_ALERT_ON_ERR)
4252042520
#if defined(WOLFSSL_ASYNC_CRYPT)

‎src/ssl.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10591,7 +10591,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1059110591
#endif
1059210592
if (ssl->options.sendVerify) {
1059310593
if ( (ssl->error = SendCertificate(ssl)) != 0) {
10594-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
10594+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1059510595
WOLFSSL_ERROR(ssl->error);
1059610596
return WOLFSSL_FATAL_ERROR;
1059710597
}
@@ -10610,7 +10610,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1061010610
#endif
1061110611
if (!ssl->options.resuming) {
1061210612
if ( (ssl->error = SendClientKeyExchange(ssl)) != 0) {
10613-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
10613+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1061410614
#ifdef WOLFSSL_EXTRA_ALERTS
1061510615
if (ssl->error == WC_NO_ERR_TRACE(NO_PEER_KEY) ||
1061610616
ssl->error == WC_NO_ERR_TRACE(PSK_KEY_ERROR)) {
@@ -10639,7 +10639,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1063910639
#if !defined(NO_CERTS) && !defined(WOLFSSL_NO_CLIENT_AUTH)
1064010640
if (ssl->options.sendVerify) {
1064110641
if ( (ssl->error = SendCertificateVerify(ssl)) != 0) {
10642-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
10642+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1064310643
WOLFSSL_ERROR(ssl->error);
1064410644
return WOLFSSL_FATAL_ERROR;
1064510645
}
@@ -10652,7 +10652,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1065210652

1065310653
case FIRST_REPLY_THIRD :
1065410654
if ( (ssl->error = SendChangeCipher(ssl)) != 0) {
10655-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
10655+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1065610656
WOLFSSL_ERROR(ssl->error);
1065710657
return WOLFSSL_FATAL_ERROR;
1065810658
}
@@ -10663,7 +10663,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1066310663

1066410664
case FIRST_REPLY_FOURTH :
1066510665
if ( (ssl->error = SendFinished(ssl)) != 0) {
10666-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
10666+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1066710667
WOLFSSL_ERROR(ssl->error);
1066810668
return WOLFSSL_FATAL_ERROR;
1066910669
}
@@ -11041,7 +11041,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1104111041
return WOLFSSL_FATAL_ERROR;
1104211042
}
1104311043
if ( (ssl->error = SendServerHello(ssl)) != 0) {
11044-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11044+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1104511045
WOLFSSL_ERROR(ssl->error);
1104611046
return WOLFSSL_FATAL_ERROR;
1104711047
}
@@ -11058,7 +11058,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1105811058
#ifndef NO_CERTS
1105911059
if (!ssl->options.resuming)
1106011060
if ( (ssl->error = SendCertificate(ssl)) != 0) {
11061-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11061+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1106211062
WOLFSSL_ERROR(ssl->error);
1106311063
return WOLFSSL_FATAL_ERROR;
1106411064
}
@@ -11071,7 +11071,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1107111071
#ifndef NO_CERTS
1107211072
if (!ssl->options.resuming)
1107311073
if ( (ssl->error = SendCertificateStatus(ssl)) != 0) {
11074-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11074+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1107511075
WOLFSSL_ERROR(ssl->error);
1107611076
return WOLFSSL_FATAL_ERROR;
1107711077
}
@@ -11088,7 +11088,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1108811088
#endif
1108911089
if (!ssl->options.resuming)
1109011090
if ( (ssl->error = SendServerKeyExchange(ssl)) != 0) {
11091-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11091+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1109211092
WOLFSSL_ERROR(ssl->error);
1109311093
return WOLFSSL_FATAL_ERROR;
1109411094
}
@@ -11101,7 +11101,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1110111101
if (!ssl->options.resuming) {
1110211102
if (ssl->options.verifyPeer) {
1110311103
if ( (ssl->error = SendCertificateRequest(ssl)) != 0) {
11104-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11104+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1110511105
WOLFSSL_ERROR(ssl->error);
1110611106
return WOLFSSL_FATAL_ERROR;
1110711107
}
@@ -11119,7 +11119,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1111911119
case CERT_REQ_SENT :
1112011120
if (!ssl->options.resuming)
1112111121
if ( (ssl->error = SendServerHelloDone(ssl)) != 0) {
11122-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11122+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1112311123
WOLFSSL_ERROR(ssl->error);
1112411124
return WOLFSSL_FATAL_ERROR;
1112511125
}
@@ -11158,7 +11158,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1115811158
#ifdef HAVE_SESSION_TICKET
1115911159
if (ssl->options.createTicket && !ssl->options.noTicketTls12) {
1116011160
if ( (ssl->error = SendTicket(ssl)) != 0) {
11161-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11161+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1116211162
WOLFSSL_MSG("Thought we need ticket but failed");
1116311163
WOLFSSL_ERROR(ssl->error);
1116411164
return WOLFSSL_FATAL_ERROR;
@@ -11177,7 +11177,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1117711177
}
1117811178

1117911179
if ( (ssl->error = SendChangeCipher(ssl)) != 0) {
11180-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11180+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1118111181
WOLFSSL_ERROR(ssl->error);
1118211182
return WOLFSSL_FATAL_ERROR;
1118311183
}
@@ -11187,7 +11187,7 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
1118711187

1118811188
case CHANGE_CIPHER_SENT :
1118911189
if ( (ssl->error = SendFinished(ssl)) != 0) {
11190-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
11190+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1119111191
WOLFSSL_ERROR(ssl->error);
1119211192
return WOLFSSL_FATAL_ERROR;
1119311193
}

‎src/tls13.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13548,7 +13548,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
1354813548
if (!ssl->options.resuming && ssl->options.sendVerify) {
1354913549
ssl->error = SendTls13Certificate(ssl);
1355013550
if (ssl->error != 0) {
13551-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
13551+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1355213552
WOLFSSL_ERROR(ssl->error);
1355313553
return WOLFSSL_FATAL_ERROR;
1355413554
}
@@ -13568,7 +13568,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
1356813568
if (!ssl->options.resuming && ssl->options.sendVerify) {
1356913569
ssl->error = SendTls13CertificateVerify(ssl);
1357013570
if (ssl->error != 0) {
13571-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
13571+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1357213572
WOLFSSL_ERROR(ssl->error);
1357313573
return WOLFSSL_FATAL_ERROR;
1357413574
}
@@ -13582,7 +13582,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
1358213582

1358313583
case FIRST_REPLY_FOURTH:
1358413584
if ((ssl->error = SendTls13Finished(ssl)) != 0) {
13585-
wolfMaybeCheckAlertOnErr(ssl, ssl->error);
13585+
wolfssl_i_MaybeCheckAlertOnErr(ssl, ssl->error);
1358613586
WOLFSSL_ERROR(ssl->error);
1358713587
return WOLFSSL_FATAL_ERROR;
1358813588
}

‎wolfssl/internal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7240,7 +7240,7 @@ WOLFSSL_LOCAL int pkcs8_encrypt(WOLFSSL_EVP_PKEY* pkey,
72407240
word32* keySz);
72417241
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
72427242

7243-
WOLFSSL_LOCAL void wolfMaybeCheckAlertOnErr(WOLFSSL* ssl, int err);
7243+
WOLFSSL_LOCAL void wolfssl_i_MaybeCheckAlertOnErr(WOLFSSL* ssl, int err);
72447244

72457245
#ifdef __cplusplus
72467246
} /* extern "C" */

0 commit comments

Comments
 (0)