[openssl-commits] [openssl] master update
Matt Caswell
matt at openssl.org
Wed May 6 12:05:52 UTC 2015
The branch master has been updated
via 4407d070e591cc8dc3f4b34779933f97cf2df222 (commit)
from 16f8d4ebf0fd4847fa83d9c61f4150273cb4f533 (commit)
- Log -----------------------------------------------------------------
commit 4407d070e591cc8dc3f4b34779933f97cf2df222
Author: Matt Caswell <matt at openssl.org>
Date: Wed May 6 11:17:07 2015 +0100
Fix s_server version specific methods
A copy&paste error as a result of the big apps cleanup broke the version
specific methods in s_server.
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
apps/s_server.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/apps/s_server.c b/apps/s_server.c
index c1b799f..55781ac 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1336,29 +1336,29 @@ int s_server_main(int argc, char *argv[])
break;
#ifndef OPENSSL_NO_SSL3
case OPT_SSL3:
- meth = SSLv3_client_method();
+ meth = SSLv3_server_method();
break;
#endif
case OPT_TLS1_2:
- meth = TLSv1_2_client_method();
+ meth = TLSv1_2_server_method();
break;
case OPT_TLS1_1:
- meth = TLSv1_1_client_method();
+ meth = TLSv1_1_server_method();
break;
case OPT_TLS1:
- meth = TLSv1_client_method();
+ meth = TLSv1_server_method();
break;
#ifndef OPENSSL_NO_DTLS1
case OPT_DTLS:
- meth = DTLS_client_method();
+ meth = DTLS_server_method();
socket_type = SOCK_DGRAM;
break;
case OPT_DTLS1:
- meth = DTLSv1_client_method();
+ meth = DTLSv1_server_method();
socket_type = SOCK_DGRAM;
break;
case OPT_DTLS1_2:
- meth = DTLSv1_2_client_method();
+ meth = DTLSv1_2_server_method();
socket_type = SOCK_DGRAM;
break;
case OPT_TIMEOUT:
More information about the openssl-commits
mailing list