Merge pull request #5534 from dgarske/zd14420

Fix for async session tickets
This commit is contained in:
Sean Parkinson
2022-09-02 08:50:35 +10:00
committed by GitHub
2 changed files with 13 additions and 3 deletions

View File

@@ -33473,7 +33473,12 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
et = (ExternalTicket*)ssl->session->ticket;
it = (InternalTicket*)et->enc_ticket;
XMEMSET(et, 0, sizeof(*et));
#ifdef WOLFSSL_ASYNC_CRYPT
if (ssl->error != WC_PENDING_E)
#endif
{
XMEMSET(et, 0, sizeof(*et));
}
/* build internal */
it->pv.major = ssl->version.major;

View File

@@ -9127,8 +9127,13 @@ static int SendTls13NewSessionTicket(WOLFSSL* ssl)
ssl->session->ticketNonce.len = DEF_TICKET_NONCE_SZ;
ssl->session->ticketNonce.data[0] = 0;
}
else
ssl->session->ticketNonce.data[0]++;
else
#ifdef WOLFSSL_ASYNC_CRYPT
if (ssl->error != WC_PENDING_E)
#endif
{
ssl->session->ticketNonce.data[0]++;
}
if (!ssl->options.noTicketTls13) {
if ((ret = CreateTicket(ssl)) != 0)