summaryrefslogtreecommitdiffstats
path: root/ssl/t1_clnt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-06-27 14:22:11 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-06-27 14:22:11 +0000
commitb4b15f68c01c4bf4557db5ff6180623411540b52 (patch)
treedc8969be13937ea8b79125e68494497474c2b1ab /ssl/t1_clnt.c
parent1eb1cf452b1263373ff3f7c91b9419adca8c3ba8 (diff)
Backport TLS v1.1 support from HEAD, ssl/ changes
Diffstat (limited to 'ssl/t1_clnt.c')
-rw-r--r--ssl/t1_clnt.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c
index c87af17712..b06bada6f2 100644
--- a/ssl/t1_clnt.c
+++ b/ssl/t1_clnt.c
@@ -66,13 +66,19 @@
static const SSL_METHOD *tls1_get_client_method(int ver);
static const SSL_METHOD *tls1_get_client_method(int ver)
{
+ if (ver == TLS1_1_VERSION)
+ return TLSv1_1_client_method();
if (ver == TLS1_VERSION)
- return(TLSv1_client_method());
- else
- return(NULL);
+ return TLSv1_client_method();
+ return NULL;
}
-IMPLEMENT_tls1_meth_func(TLSv1_client_method,
+IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_client_method,
+ ssl_undefined_function,
+ ssl3_connect,
+ tls1_get_client_method)
+
+IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method,
ssl_undefined_function,
ssl3_connect,
tls1_get_client_method)