summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-12-30 00:03:40 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-12-30 00:03:40 +0000
commit8c3f86898340e09c31aeb8f58b03c28207ef785f (patch)
treeaf1017f4633ec75f75f1cad0a32ae1840ab2fc60 /apps
parentd03cc94f473da6c428116816c56eaa9cb527fb46 (diff)
remove unused cipher functionality from s_client
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c8
1 files changed, 1 insertions, 7 deletions
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"));