X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fs_client.c;h=55facead51b26980fc318839ae8a6bba3b8cce79;hp=ce199be81bbb57e5dc50bdbbd0dcfc454770f42d;hb=d0595f170c225b918a980f49c5d16ec53545a6ad;hpb=156421a2af4d1295a4c188019bfe2f76af6ec895

diff --git a/apps/s_client.c b/apps/s_client.c
index ce199be81b..55facead51 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -601,6 +601,7 @@ int MAIN(int argc, char **argv)
 #endif
 #ifndef OPENSSL_NO_TLSEXT
 	char *servername = NULL; 
+	char *curves=NULL;
         tlsextctx tlsextcbp = 
         {NULL,0};
 # ifndef OPENSSL_NO_NEXTPROTONEG
@@ -622,13 +623,7 @@ int MAIN(int argc, char **argv)
 	SRP_ARG srp_arg = {NULL,NULL,0,0,0,1024};
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 	meth=SSLv23_client_method();
-#elif !defined(OPENSSL_NO_SSL3)
-	meth=SSLv3_client_method();
-#elif !defined(OPENSSL_NO_SSL2)
-	meth=SSLv2_client_method();
-#endif
 
 	apps_startup();
 	c_Pause=0;
@@ -943,6 +938,11 @@ int MAIN(int argc, char **argv)
 			servername= *(++argv);
 			/* meth=TLSv1_client_method(); */
 			}
+		else if	(strcmp(*argv,"-curves") == 0)
+			{
+			if (--argc < 1) goto bad;
+			curves= *(++argv);
+			}
 #endif
 #ifndef OPENSSL_NO_JPAKE
 		else if (strcmp(*argv,"-jpake") == 0)
@@ -1182,6 +1182,12 @@ bad:
 		}
 
 #ifndef OPENSSL_NO_TLSEXT
+	if (curves != NULL)
+		if(!SSL_CTX_set1_curves_list(ctx,curves)) {
+		BIO_printf(bio_err,"error setting curve list\n");
+		ERR_print_errors(bio_err);
+		goto end;
+	}
 	if (servername != NULL)
 		{
 		tlsextcbp.biodebug = bio_err;