From: Lutz Jänicke <jaenicke@openssl.org>
Date: Fri, 19 Oct 2007 07:44:10 +0000 (+0000)
Subject: Prepare OpenSSL 0.9.8g: cherry pick
X-Git-Tag: OpenSSL_0_9_8g~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28084788993633db2edb73b3d3bc584fa055950b;p=oweals%2Fopenssl.git

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
---

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