diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-04-29 17:22:35 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-04-29 17:22:35 +0000 |
commit | 2f63ad5b35920ce1cbd52f33341e49ccd2541a54 (patch) | |
tree | 34c0d071c4a0ad8209b1eb84af1ede300bf464bb /ssl | |
parent | c78bba23436b05e666caf60119409239bf9d8a79 (diff) | |
download | openssl-2f63ad5b35920ce1cbd52f33341e49ccd2541a54.tar.gz |
Update from stable branch.
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s3_clnt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 74f5abe13c..4ca47faf51 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -2918,7 +2918,11 @@ static int ssl3_check_finished(SSL *s) { int ok; long n; - if (!s->session->tlsext_tick) + /* If we have no ticket or session ID is non-zero length (a match of + * a non-zero session length would never reach here) it cannot be a + * resumed session. + */ + if (!s->session->tlsext_tick || s->session->session_id_length) return 1; /* this function is called when we really expect a Certificate * message, so permit appropriate message length */ |