wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

adjust type for max tickets variable and number sent with WOLFSSL_TLS13_TICKET_BEFORE_FINISHED macro

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-08-26 15:45:21 -06:00
parent 1a8109f77d
commit a52df87c8a
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@@ -3038,7 +3038,7 @@ int wolfSSL_CTX_set_num_tickets(WOLFSSL_CTX* ctx, size_t mxTickets)
if (ctx == NULL) if (ctx == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
ctx->maxTicketTls13 = mxTickets; ctx->maxTicketTls13 = (unsigned int)mxTickets;
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
@@ -3050,7 +3050,7 @@ size_t wolfSSL_CTX_get_num_tickets(WOLFSSL_CTX* ctx)
if (ctx == NULL) if (ctx == NULL)
return 0; return 0;
return ctx->maxTicketTls13; return (size_t)ctx->maxTicketTls13;
} }
#endif /* !NO_WOLFSSL_SERVER */ #endif /* !NO_WOLFSSL_SERVER */

13
src/tls13.c
View File

@@ -9168,9 +9168,6 @@ const char* wolfSSL_get_cipher_name_by_hash(WOLFSSL* ssl, const char* hash)
*/ */
int wolfSSL_accept_TLSv13(WOLFSSL* ssl) int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
{ {
#ifdef HAVE_SESSION_TICKET
byte ticketsSent; /* count for number of tickets sent */
#endif
#if !defined(NO_CERTS) && (defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)) #if !defined(NO_CERTS) && (defined(HAVE_SESSION_TICKET) || !defined(NO_PSK))
word16 havePSK = 0; word16 havePSK = 0;
#endif #endif
@@ -9432,6 +9429,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
} }
ssl->options.ticketsSent = 1;
#endif #endif
#endif /* HAVE_SESSION_TICKET */ #endif /* HAVE_SESSION_TICKET */
ssl->options.acceptState = TLS13_PRE_TICKET_SENT; ssl->options.acceptState = TLS13_PRE_TICKET_SENT;
@@ -9451,13 +9449,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
case TLS13_ACCEPT_FINISHED_DONE : case TLS13_ACCEPT_FINISHED_DONE :
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
for (ticketsSent = 0; ticketsSent < ssl->options.maxTicketTls13; while (ssl->options.ticketsSent < ssl->options.maxTicketTls13) {
ticketsSent++) {
#ifdef WOLFSSL_TLS13_TICKET_BEFORE_FINISHED
if (!ssl->options.verifyPeer) {
}
else
#endif
if (!ssl->options.noTicketTls13 && ssl->ctx->ticketEncCb if (!ssl->options.noTicketTls13 && ssl->ctx->ticketEncCb
!= NULL) { != NULL) {
if ((ssl->error = SendTls13NewSessionTicket(ssl)) != 0) { if ((ssl->error = SendTls13NewSessionTicket(ssl)) != 0) {
@@ -9465,6 +9457,7 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
} }
ssl->options.ticketsSent++;
/* only one session ticket is sent on session resumption */ /* only one session ticket is sent on session resumption */
if (ssl->options.resuming) { if (ssl->options.resuming) {

9
wolfssl/internal.h
View File

@@ -2841,7 +2841,9 @@ struct WOLFSSL_CTX {
byte noTicketTls12:1; /* TLS 1.2 server won't send ticket */ byte noTicketTls12:1; /* TLS 1.2 server won't send ticket */
#endif #endif
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
byte maxTicketTls13; /* maximum number of tickets to send */ #if defined(HAVE_SESSION_TICKET) && !defined(NO_WOLFSSL_SERVER)
unsigned int maxTicketTls13; /* maximum number of tickets to send */
#endif
byte noTicketTls13:1; /* TLS 1.3 Server won't create new Ticket */ byte noTicketTls13:1; /* TLS 1.3 Server won't create new Ticket */
byte noPskDheKe:1; /* Don't use (EC)DHE with PSK */ byte noPskDheKe:1; /* Don't use (EC)DHE with PSK */
#endif #endif
@@ -3568,6 +3570,10 @@ typedef struct Options {
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL) #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(WOLFSSL_WPAS_SMALL)
unsigned long mask; /* store SSL_OP_ flags */ unsigned long mask; /* store SSL_OP_ flags */
#endif #endif
#if defined(HAVE_SESSION_TICKET) && defined(WOLFSSL_TLS13)
unsigned int maxTicketTls13; /* maximum number of tickets to send */
unsigned int ticketsSent; /* keep track of the total sent */
#endif
/* on/off or small bit flags, optimize layout */ /* on/off or small bit flags, optimize layout */
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK) #if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
@@ -3627,7 +3633,6 @@ typedef struct Options {
word16 rejectTicket:1; /* Callback rejected ticket */ word16 rejectTicket:1; /* Callback rejected ticket */
word16 noTicketTls12:1; /* TLS 1.2 server won't send ticket */ word16 noTicketTls12:1; /* TLS 1.2 server won't send ticket */
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
byte maxTicketTls13; /* maximum number of tickets to send */
word16 noTicketTls13:1; /* Server won't create new Ticket */ word16 noTicketTls13:1; /* Server won't create new Ticket */
#endif #endif
#endif #endif