diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2010-06-27 14:22:11 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2010-06-27 14:22:11 +0000 |
commit | b4b15f68c01c4bf4557db5ff6180623411540b52 (patch) | |
tree | dc8969be13937ea8b79125e68494497474c2b1ab /ssl/t1_meth.c | |
parent | 1eb1cf452b1263373ff3f7c91b9419adca8c3ba8 (diff) |
Backport TLS v1.1 support from HEAD, ssl/ changes
Diffstat (limited to 'ssl/t1_meth.c')
-rw-r--r-- | ssl/t1_meth.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c index 6ce7c0bbf5..3257636425 100644 --- a/ssl/t1_meth.c +++ b/ssl/t1_meth.c @@ -60,16 +60,21 @@ #include <openssl/objects.h> #include "ssl_locl.h" -static const SSL_METHOD *tls1_get_method(int ver); static const SSL_METHOD *tls1_get_method(int ver) { + if (ver == TLS1_1_VERSION) + return TLSv1_1_method(); if (ver == TLS1_VERSION) - return(TLSv1_method()); - else - return(NULL); + return TLSv1_method(); + return NULL; } -IMPLEMENT_tls1_meth_func(TLSv1_method, +IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method, + ssl3_accept, + ssl3_connect, + tls1_get_method) + +IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method, ssl3_accept, ssl3_connect, tls1_get_method) |