summaryrefslogtreecommitdiffstats
path: root/ssl/s3_lib.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2007-09-21 14:05:08 +0000
committerBodo Möller <bodo@openssl.org>2007-09-21 14:05:08 +0000
commit4ab0088bfe20d251bc2a1afae543685d2faa3935 (patch)
tree501a4f6f3b48015e44611823039ed437f9504114 /ssl/s3_lib.c
parent3bd1690bfb59b014fafa93b22e737e50c7db4b5b (diff)
More changes from HEAD:
- no need to disable SSL 2.0 for SSL_CTRL_SET_TLSEXT_HOSTNAME now that ssl23_client_hello takes care of that - fix buffer overrun checks in ssl_add_serverhello_tlsext()
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r--ssl/s3_lib.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 2bacb2601e..95e893737c 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1931,7 +1931,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
SSLerr(SSL_F_SSL3_CTRL, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE);
return 0;
}
- s->options |= SSL_OP_NO_SSLv2; /* can't use extension w/ SSL 2.0 format */
break;
case SSL_CTRL_SET_TLSEXT_DEBUG_ARG:
s->tlsext_debug_arg=parg;