Fix s_server -ssl2. Previously this reported "Error setting EC curve"

[oweals/openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 1e15281c213afafbb726e71eb0d42d94862dd102..8a28bdd69f08cbc3d8092229ee37c23193568614 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -509,7 +509,9 @@ static void sv_usage(void)
        BIO_printf(bio_err," -srpuserseed string - A seed string for a default user salt.\n");
 #endif
        BIO_printf(bio_err," -ssl2         - Just talk SSLv2\n");
+#ifndef OPENSSL_NO_SSL3_METHOD
        BIO_printf(bio_err," -ssl3         - Just talk SSLv3\n");
+#endif
        BIO_printf(bio_err," -tls1_2       - Just talk TLSv1.2\n");
        BIO_printf(bio_err," -tls1_1       - Just talk TLSv1.1\n");
        BIO_printf(bio_err," -tls1         - Just talk TLSv1\n");
@@ -1406,9 +1408,12 @@ int MAIN(int argc, char *argv[])
                        { www=3; }
 #ifndef OPENSSL_NO_SSL2
                else if (strcmp(*argv,"-ssl2") == 0)
-                       { meth=SSLv2_server_method(); }
+                       {
+                       no_ecdhe=1;
+                       meth=SSLv2_server_method();
+                       }
 #endif
-#ifndef OPENSSL_NO_SSL3
+#ifndef OPENSSL_NO_SSL3_METHOD
                else if (strcmp(*argv,"-ssl3") == 0)
                        { meth=SSLv3_server_method(); }
 #endif