From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 30 Dec 2012 00:03:40 +0000 (+0000)
Subject: remove unused cipher functionality from s_client
X-Git-Tag: OpenSSL_1_0_2-beta1~475
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8c3f86898340e09c31aeb8f58b03c28207ef785f;p=oweals%2Fopenssl.git

remove unused cipher functionality from s_client
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 6f16d06617..c559004731 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -575,7 +575,7 @@ int MAIN(int argc, char **argv)
 	char *passarg = NULL, *pass = NULL;
 	X509 *cert = NULL;
 	EVP_PKEY *key = NULL;
-	char *CApath=NULL,*CAfile=NULL,*cipher=NULL;
+	char *CApath=NULL,*CAfile=NULL;
 	int reconnect=0,badop=0,verify=SSL_VERIFY_NONE;
 	int crlf=0;
 	int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending;
@@ -1163,12 +1163,6 @@ bad:
 #endif
 
 	if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
-	if (cipher != NULL)
-		if(!SSL_CTX_set_cipher_list(ctx,cipher)) {
-		BIO_printf(bio_err,"error setting cipher list\n");
-		ERR_print_errors(bio_err);
-		goto end;
-	}
 #if 0
 	else
 		SSL_CTX_set_cipher_list(ctx,getenv("SSL_CIPHER"));