mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-07-30 10:47:28 +02:00
SendAlert: propagate return error in non-fatal SendAlert
This commit is contained in:
@ -21496,8 +21496,7 @@ int SendCertificate(WOLFSSL* ssl)
|
|||||||
#ifdef OPENSSL_EXTRA
|
#ifdef OPENSSL_EXTRA
|
||||||
if (ssl->version.major == SSLv3_MAJOR
|
if (ssl->version.major == SSLv3_MAJOR
|
||||||
&& ssl->version.minor == SSLv3_MINOR){
|
&& ssl->version.minor == SSLv3_MINOR){
|
||||||
SendAlert(ssl, alert_warning, no_certificate);
|
return SendAlert(ssl, alert_warning, no_certificate);
|
||||||
return 0;
|
|
||||||
} else {
|
} else {
|
||||||
#endif
|
#endif
|
||||||
certSz = 0;
|
certSz = 0;
|
||||||
@ -36896,6 +36895,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
|
|||||||
{
|
{
|
||||||
int ad = 0;
|
int ad = 0;
|
||||||
int sniRet = 0;
|
int sniRet = 0;
|
||||||
|
int ret = 0;
|
||||||
/* Stunnel supports a custom sni callback to switch an SSL's ctx
|
/* Stunnel supports a custom sni callback to switch an SSL's ctx
|
||||||
* when SNI is received. Call it now if exists */
|
* when SNI is received. Call it now if exists */
|
||||||
if(ssl && ssl->ctx && ssl->ctx->sniRecvCb) {
|
if(ssl && ssl->ctx && ssl->ctx->sniRecvCb) {
|
||||||
@ -36904,7 +36904,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
|
|||||||
switch (sniRet) {
|
switch (sniRet) {
|
||||||
case warning_return:
|
case warning_return:
|
||||||
WOLFSSL_MSG("Error in custom sni callback. Warning alert");
|
WOLFSSL_MSG("Error in custom sni callback. Warning alert");
|
||||||
SendAlert(ssl, alert_warning, ad);
|
ret = SendAlert(ssl, alert_warning, ad);
|
||||||
break;
|
break;
|
||||||
case fatal_return:
|
case fatal_return:
|
||||||
WOLFSSL_MSG("Error in custom sni callback. Fatal alert");
|
WOLFSSL_MSG("Error in custom sni callback. Fatal alert");
|
||||||
@ -36917,7 +36917,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
#endif /* HAVE_SNI */
|
#endif /* HAVE_SNI */
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user