remove unused cipher functionality from s_client
authorDr. Stephen Henson <steve@openssl.org>
Sun, 30 Dec 2012 00:03:40 +0000 (00:03 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 30 Dec 2012 00:03:40 +0000 (00:03 +0000)
apps/s_client.c

index 6f16d066172a55b07993c705604327caebc039a8..c559004731e6c93349c03797d65691d42c99140e 100644 (file)
@@ -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"));