projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport TLS v1.1 support from HEAD, ssl/ changes
[openssl.git]
/
ssl
/
t1_srvr.c
diff --git
a/ssl/t1_srvr.c
b/ssl/t1_srvr.c
index 42525e9e89ff08f8dd28ff65d1888f6b482352cb..274a3d6738c7cc2f0856f20b1a2f10cfd336ff8c 100644
(file)
--- 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)
{
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)
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)
ssl3_accept,
ssl_undefined_function,
tls1_get_server_method)