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 fabc634d688889a84a91ec77cb8e8a171018a28b..7690ed65702d618db8a311d08b6b105909774005 100644 (file)
--- 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