summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLutz Jänicke <jaenicke@openssl.org>2007-10-19 07:44:10 +0000
committerLutz Jänicke <jaenicke@openssl.org>2007-10-19 07:44:10 +0000
commit28084788993633db2edb73b3d3bc584fa055950b (patch)
tree98b2bb608f3c475a333f3a143aad31518600bb7e
parent98d2eee05ee17527bcbafc72c5195305db9de1e8 (diff)
Prepare OpenSSL 0.9.8g: cherry pick
http://cvs.openssl.org/chngview?cn=16696 Ensure the ticket expected flag is reset when a stateless resumption is successful. Submitted by: steve
-rw-r--r--ssl/t1_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index fabc634d68..7690ed6570 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -617,6 +617,7 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
memcpy(sess->session_id, sess_id, sesslen);
sess->session_id_length = sesslen;
*psess = sess;
+ s->tlsext_ticket_expected = 0;
return 1;
}
/* If session decrypt failure indicate a cache miss and set state to