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_srvr.c | |
| parent | 1eb1cf452b1263373ff3f7c91b9419adca8c3ba8 (diff) | |
Backport TLS v1.1 support from HEAD, ssl/ changes
Diffstat (limited to 'ssl/t1_srvr.c')
| -rw-r--r-- | ssl/t1_srvr.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c index 42525e9e89..274a3d6738 100644 --- a/ssl/t1_srvr.c +++ b/ssl/t1_srvr.c @@ -67,13 +67,19 @@ static const SSL_METHOD *tls1_get_server_method(int ver); static const SSL_METHOD *tls1_get_server_method(int ver) { + if (ver == TLS1_1_VERSION) + return TLSv1_1_server_method(); if (ver == TLS1_VERSION) - return(TLSv1_server_method()); - else - return(NULL); + return TLSv1_server_method(); + return NULL; } -IMPLEMENT_tls1_meth_func(TLSv1_server_method, +IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_server_method, + ssl3_accept, + ssl_undefined_function, + tls1_get_server_method) + +IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_server_method, ssl3_accept, ssl_undefined_function, tls1_get_server_method) |