projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always use SSLv23_{client,server}_method in s_client.c and s_server.c,
[openssl.git]
/
apps
/
s_server.c
diff --git
a/apps/s_server.c
b/apps/s_server.c
index 4603cdafcd12a9c7dd9c59c6718713ed77ad279b..608f3208dcc09dc60850c562d05d67e9a21c3663 100644
(file)
--- a/
apps/s_server.c
+++ b/
apps/s_server.c
@@
-980,17
+980,7
@@
int MAIN(int argc, char *argv[])
char *srpuserseed = NULL;
char *srp_verifier_file = NULL;
#endif
char *srpuserseed = NULL;
char *srp_verifier_file = NULL;
#endif
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
meth=SSLv23_server_method();
meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
- meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
- meth=SSLv2_server_method();
-#elif !defined(OPENSSL_NO_TLS1)
- meth=TLSv1_server_method();
-#else
- /* #error no SSL version enabled */
-#endif
local_argc=argc;
local_argv=argv;
local_argc=argc;
local_argv=argv;