summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2003-07-21 15:17:46 +0000
committerBodo Möller <bodo@openssl.org>2003-07-21 15:17:46 +0000
commitddc38679cedcd154eb18187b8c384b1a05f61fc6 (patch)
tree48d97c40ed920f7ee3c5af850fbb85337a0333ee /ssl
parent02e0559477977f09279a7781817dc6f5c90f54c1 (diff)
tolerate extra data at end of client hello for SSL 3.0
PR: 659
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_srvr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index e941068416..c2ac8cb2fc 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -883,6 +883,9 @@ static int ssl3_get_client_hello(SSL *s)
}
/* TLS does not mind if there is extra stuff */
+#if 0 /* SSL 3.0 does not mind either, so we should disable this test
+ * (was enabled in 0.9.6d through 0.9.6j and 0.9.7 through 0.9.7b,
+ * in earlier SSLeay/OpenSSL releases this test existed but was buggy) */
if (s->version == SSL3_VERSION)
{
if (p < (d+n))
@@ -894,6 +897,7 @@ static int ssl3_get_client_hello(SSL *s)
goto f_err;
}
}
+#endif
/* Given s->session->ciphers and SSL_get_ciphers, we must
* pick a cipher */