generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix from stable branch.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2008-09-03 22:17:11 +00:00
parent 305514000c
commit e8da6a1d0f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/ssl_sess.c
View File

@@ -438,7 +438,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
fatal = 1; fatal = 1;
goto err; goto err;
} }
else if (r == 0 || (!ret || !len)) else if (r == 0 || (!ret && !len))
goto err; goto err;
else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
#else #else

11
ssl/t1_lib.c
View File

@@ -1388,6 +1388,13 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
/* Point after session ID in client hello */ /* Point after session ID in client hello */
const unsigned char *p = session_id + len; const unsigned char *p = session_id + len;
unsigned short i; unsigned short i;
/* If tickets disabled behave as if no ticket present
* to permit stateful resumption.
*/
if (SSL_get_options(s) & SSL_OP_NO_TICKET)
return 1;
if ((s->version <= SSL3_VERSION) || !limit) if ((s->version <= SSL3_VERSION) || !limit)
return 1; return 1;
if (p >= limit) if (p >= limit)
@@ -1419,8 +1426,8 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
* trigger a full handshake * trigger a full handshake
*/ */
if (SSL_get_options(s) & SSL_OP_NO_TICKET) if (SSL_get_options(s) & SSL_OP_NO_TICKET)
return 0; return 1;
/* If zero length not client will accept a ticket /* If zero length note client will accept a ticket
* and indicate cache miss to trigger full handshake * and indicate cache miss to trigger full handshake
*/ */
if (size == 0) if (size == 0)