|
|
|
|
@ -106,42 +106,3 @@ Index: ssl/ssl_asn1.c
|
|
|
|
|
os.length=0;
|
|
|
|
|
os.data=NULL;
|
|
|
|
|
M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,10);
|
|
|
|
|
Index: ssl/ssl_sess.c
|
|
|
|
|
--- ssl/ssl_sess.c 12 Aug 2007 18:59:03 -0000 1.51.2.7
|
|
|
|
|
+++ ssl/ssl_sess.c 17 Oct 2007 17:30:15 -0000 1.51.2.8
|
|
|
|
|
@@ -320,10 +320,12 @@
|
|
|
|
|
fatal = 1;
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
- else if (r == 0)
|
|
|
|
|
+ else if (r == 0 || (!ret && !len))
|
|
|
|
|
goto err;
|
|
|
|
|
else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
|
|
|
|
|
#else
|
|
|
|
|
+ if (len == 0)
|
|
|
|
|
+ goto err;
|
|
|
|
|
if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
Index: ssl/ssl.h
|
|
|
|
|
--- ssl/ssl.h 12 Oct 2007 00:00:30 -0000 1.161.2.15
|
|
|
|
|
+++ ssl/ssl.h 17 Oct 2007 21:22:58 -0000 1.161.2.16
|
|
|
|
|
@@ -995,7 +995,6 @@
|
|
|
|
|
int first_packet;
|
|
|
|
|
int client_version; /* what was passed, used for
|
|
|
|
|
* SSLv3/TLS rollback check */
|
|
|
|
|
- unsigned int max_send_fragment;
|
|
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
|
/* TLS extension debug callback */
|
|
|
|
|
void (*tlsext_debug_cb)(SSL *s, int client_server, int type,
|
|
|
|
|
Index: ssl/t1_lib.c
|
|
|
|
|
--- ssl/t1_lib.c 12 Oct 2007 00:00:31 -0000 1.13.2.7
|
|
|
|
|
+++ ssl/t1_lib.c 18 Oct 2007 11:39:11 -0000 1.13.2.8
|
|
|
|
|
@@ -847,6 +847,7 @@
|
|
|
|
|
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
|
|
|
|
|
|