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

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
toddouska
2014-10-01 09:45:57 -07:00
parent 41647e441a ee68797cf1
commit 8e96234513
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cyassl/internal.h
View File

@@ -1261,11 +1261,12 @@ CYASSL_LOCAL word16 TLSX_WriteResponse(CYASSL* ssl, byte* output);
CYASSL_LOCAL int TLSX_Parse(CYASSL* ssl, byte* input, word16 length, CYASSL_LOCAL int TLSX_Parse(CYASSL* ssl, byte* input, word16 length,
byte isRequest, Suites *suites); byte isRequest, Suites *suites);
#elif defined(HAVE_SNI) \ #elif defined(HAVE_SNI) \
|| defined(HAVE_MAX_FRAGMENT) \ || defined(HAVE_MAX_FRAGMENT) \
|| defined(HAVE_TRUNCATED_HMAC) \ || defined(HAVE_TRUNCATED_HMAC) \
|| defined(HAVE_SUPPORTED_CURVES) \ || defined(HAVE_SUPPORTED_CURVES) \
|| defined(HAVE_SECURE_RENEGOTIATION) || defined(HAVE_SECURE_RENEGOTIATION) \
|| defined(HAVE_SESSION_TICKET)
#error Using TLS extensions requires HAVE_TLS_EXTENSIONS to be defined. #error Using TLS extensions requires HAVE_TLS_EXTENSIONS to be defined.
@@ -2069,6 +2070,7 @@ struct CYASSL {
This function doesn't free an early ticket, but will erase it's This function doesn't free an early ticket, but will erase it's
reference inside the extensions. reference inside the extensions.
*/ */
byte expect_session_ticket;
SessionTicket* candidate_ticket; SessionTicket* candidate_ticket;
SessionTicket* session_ticket; SessionTicket* session_ticket;
#endif #endif

1
src/internal.c
View File

@@ -1747,6 +1747,7 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
#endif #endif
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
#ifndef NO_CYASSL_CLIENT #ifndef NO_CYASSL_CLIENT
ssl->expect_session_ticket = 0;
ssl->candidate_ticket = NULL; ssl->candidate_ticket = NULL;
ssl->session_ticket = NULL; ssl->session_ticket = NULL;
#endif #endif

16
src/tls.c
View File

@@ -1802,12 +1802,16 @@ static word16 TLSX_SessionTicket_Write(SessionTicket* ticket, byte* output,
static int TLSX_SessionTicket_Parse(CYASSL* ssl, byte* input, word16 length, static int TLSX_SessionTicket_Parse(CYASSL* ssl, byte* input, word16 length,
byte isRequest) byte isRequest)
{ {
if (!isRequest) if (!isRequest) {
return length != 0 ? BUFFER_ERROR : 0; if (length != 0)
return BUFFER_ERROR;
/* TODO server side */
(void)ssl; ssl->expect_session_ticket = 1;
(void)input; }
else {
/* TODO server side */
(void)input;
}
return 0; return 0;
} }