Merge pull request #5443 from TakayukiMatsuo/doalert

This commit is contained in:
Chris Conlon
2022-08-08 15:22:18 -06:00
committed by GitHub
2 changed files with 2 additions and 8 deletions

View File

@@ -2312,14 +2312,9 @@ int DecryptTls13(WOLFSSL* ssl, byte* output, const byte* input, word16 sz,
if (ret != CRYPTOCB_UNAVAILABLE) { if (ret != CRYPTOCB_UNAVAILABLE) {
#ifndef WOLFSSL_EARLY_DATA #ifndef WOLFSSL_EARLY_DATA
if (ret < 0) { if (ret < 0) {
if (doAlert) {
SendAlert(ssl, alert_fatal, bad_record_mac);
}
ret = VERIFY_MAC_ERROR; ret = VERIFY_MAC_ERROR;
WOLFSSL_ERROR_VERBOSE(ret); WOLFSSL_ERROR_VERBOSE(ret);
} }
#else
(void)doAlert;
#endif #endif
return ret; return ret;
} }

View File

@@ -2794,9 +2794,8 @@ int wc_tsip_generateVerifyData(
WOLFSSL_LEAVE("tsip_generateVerifyData", BAD_FUNC_ARG); WOLFSSL_LEAVE("tsip_generateVerifyData", BAD_FUNC_ARG);
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (XSTRNCMP((const char*)side, (const char*)tls_server, FINISHED_LABEL_SZ) if (XSTRNCMP((const char*)side, (const char*)kTlsServerFinStr,
== 0) FINISHED_LABEL_SZ) == 0) {
{
l_side = R_TSIP_TLS_GENERATE_SERVER_VERIFY; l_side = R_TSIP_TLS_GENERATE_SERVER_VERIFY;
} }