feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

allow bogus sessionID when ticket callback rejects ticket

Browse Source
This commit is contained in:
toddouska
2016-07-13 12:47:59 -06:00
parent 7b76c3ab36
commit 5f21f93c61
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -17668,7 +17668,7 @@ int DoSessionTicket(WOLFSSL* ssl,
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
if (ssl->options.useTicket == 1) { if (ssl->options.useTicket == 1) {
session = &ssl->session; session = &ssl->session;
} else if (bogusID) { } else if (bogusID == 1 && ssl->options.rejectTicket == 0) {
WOLFSSL_MSG("Bogus session ID without session ticket"); WOLFSSL_MSG("Bogus session ID without session ticket");
return BUFFER_ERROR; return BUFFER_ERROR;
} }

1
src/tls.c
View File

@@ -3181,6 +3181,7 @@ static int TLSX_SessionTicket_Parse(WOLFSSL* ssl, byte* input, word16 length,
} }
} else if (ret == WOLFSSL_TICKET_RET_REJECT) { } else if (ret == WOLFSSL_TICKET_RET_REJECT) {
WOLFSSL_MSG("Process client ticket rejected, not using"); WOLFSSL_MSG("Process client ticket rejected, not using");
ssl->options.rejectTicket = 1;
ret = 0; /* not fatal */ ret = 0; /* not fatal */
} else if (ret == WOLFSSL_TICKET_RET_FATAL || ret < 0) { } else if (ret == WOLFSSL_TICKET_RET_FATAL || ret < 0) {
WOLFSSL_MSG("Process client ticket fatal error, not using"); WOLFSSL_MSG("Process client ticket fatal error, not using");

1
wolfssl/internal.h
View File

@@ -2417,6 +2417,7 @@ typedef struct Options {
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
word16 createTicket:1; /* Server to create new Ticket */ word16 createTicket:1; /* Server to create new Ticket */
word16 useTicket:1; /* Use Ticket not session cache */ word16 useTicket:1; /* Use Ticket not session cache */
word16 rejectTicket:1; /* Callback rejected ticket */
#endif #endif
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
word16 dtlsHsRetain:1; /* DTLS retaining HS data */ word16 dtlsHsRetain:1; /* DTLS retaining HS data */