wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6193 from JacobBarthelmeh/tls13

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-03-14 14:54:00 +01:00
committed by GitHub
parent c61d079905 d7cd7bc256
commit caad42291b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal.c
View File

@ -34638,15 +34638,18 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
return VERSION_ERROR; return VERSION_ERROR;
} }
} }
#ifdef WOLFSSL_TLS13
/* Check resumption master secret. */ /* Check resumption master secret. */
if (IsAtLeastTLSv1_3(it->pv) && if (IsAtLeastTLSv1_3(it->pv) &&
it->ticketNonceLen > MAX_TICKET_NONCE_STATIC_SZ) { it->ticketNonceLen > MAX_TICKET_NONCE_STATIC_SZ) {
WOLFSSL_MSG("Unsupported ticketNonce len in ticket"); WOLFSSL_MSG("Unsupported ticketNonce len in ticket");
return BAD_TICKET_ENCRYPT; return BAD_TICKET_ENCRYPT;
} }
#endif
return 0; return 0;
} }
#if defined(WOLFSSL_TLS13)
/* Return 0 when check successful. <0 on failure. */ /* Return 0 when check successful. <0 on failure. */
int DoClientTicketCheck(const WOLFSSL* ssl, const PreSharedKey* psk, int DoClientTicketCheck(const WOLFSSL* ssl, const PreSharedKey* psk,
sword64 timeout, const byte* suite) sword64 timeout, const byte* suite)
@ -34712,6 +34715,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif #endif
return 0; return 0;
} }
#endif /* WOLFSSL_SLT13 */
void DoClientTicketFinalize(WOLFSSL* ssl, InternalTicket* it) void DoClientTicketFinalize(WOLFSSL* ssl, InternalTicket* it)
{ {
@ -34784,6 +34788,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
ssl->version.minor = it->pv.minor; ssl->version.minor = it->pv.minor;
} }
#if defined(WOLFSSL_TLS13)
/* Parse ticket sent by client, returns callback return value. Doesn't /* Parse ticket sent by client, returns callback return value. Doesn't
* modify ssl and stores the InternalTicket inside psk */ * modify ssl and stores the InternalTicket inside psk */
int DoClientTicket_ex(const WOLFSSL* ssl, PreSharedKey* psk) int DoClientTicket_ex(const WOLFSSL* ssl, PreSharedKey* psk)
@ -34823,6 +34828,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
} }
return decryptRet; return decryptRet;
} }
#endif /* WOLFSL_TLS13 */
/* Parse ticket sent by client, returns callback return value */ /* Parse ticket sent by client, returns callback return value */
int DoClientTicket(WOLFSSL* ssl, const byte* input, word32 len) int DoClientTicket(WOLFSSL* ssl, const byte* input, word32 len)
@ -34862,6 +34868,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
return decryptRet; return decryptRet;
} }
#ifdef WOLFSSL_TLS13
void CleanupClientTickets(PreSharedKey* psk) void CleanupClientTickets(PreSharedKey* psk)
{ {
for (; psk != NULL; psk = psk->next) { for (; psk != NULL; psk = psk->next) {
@ -34878,6 +34885,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
} }
} }
} }
#endif /* WOLFSSL_TLS13 */
/* send Session Ticket */ /* send Session Ticket */

8
wolfssl/internal.h
View File

@ -5656,12 +5656,16 @@ WOLFSSL_LOCAL int SendTicket(WOLFSSL* ssl);
WOLFSSL_LOCAL int DoDecryptTicket(const WOLFSSL* ssl, const byte* input, WOLFSSL_LOCAL int DoDecryptTicket(const WOLFSSL* ssl, const byte* input,
word32 len, InternalTicket **it); word32 len, InternalTicket **it);
/* Return 0 when check successful. <0 on failure. */ /* Return 0 when check successful. <0 on failure. */
WOLFSSL_LOCAL void DoClientTicketFinalize(WOLFSSL* ssl, InternalTicket* it);
#ifdef WOLFSSL_TLS13
WOLFSSL_LOCAL int DoClientTicketCheck(const WOLFSSL* ssl, WOLFSSL_LOCAL int DoClientTicketCheck(const WOLFSSL* ssl,
const PreSharedKey* psk, sword64 timeout, const byte* suite); const PreSharedKey* psk, sword64 timeout, const byte* suite);
WOLFSSL_LOCAL void DoClientTicketFinalize(WOLFSSL* ssl, InternalTicket* it);
WOLFSSL_LOCAL void CleanupClientTickets(PreSharedKey* psk); WOLFSSL_LOCAL void CleanupClientTickets(PreSharedKey* psk);
WOLFSSL_LOCAL int DoClientTicket(WOLFSSL* ssl, const byte* input, word32 len);
WOLFSSL_LOCAL int DoClientTicket_ex(const WOLFSSL* ssl, PreSharedKey* psk); WOLFSSL_LOCAL int DoClientTicket_ex(const WOLFSSL* ssl, PreSharedKey* psk);
#endif
WOLFSSL_LOCAL int DoClientTicket(WOLFSSL* ssl, const byte* input, word32 len);
#endif /* HAVE_SESSION_TICKET */ #endif /* HAVE_SESSION_TICKET */
WOLFSSL_LOCAL int SendData(WOLFSSL* ssl, const void* data, int sz); WOLFSSL_LOCAL int SendData(WOLFSSL* ssl, const void* data, int sz);
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13