[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: OpenSSL_1_0_2-stable: openssl/apps/ s_client.c
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2012-12-30 0:03:41
Message-ID: 20121230000341.156E72EA70 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steve@openssl.org
  Module: openssl                          Date:   30-Dec-2012 01:03:41
  Branch: OpenSSL_1_0_2-stable             Handle: 2012123000034000

  Modified files:           (Branch: OpenSSL_1_0_2-stable)
    openssl/apps            s_client.c

  Log:
    remove unused cipher functionality from s_client

  Summary:
    Revision    Changes     Path
    1.123.2.6.2.15.2.20+1  -7      openssl/apps/s_client.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/apps/s_client.c
  ============================================================================
  $ cvs diff -u -r1.123.2.6.2.15.2.19 -r1.123.2.6.2.15.2.20 s_client.c
  --- openssl/apps/s_client.c	29 Dec 2012 23:58:44 -0000	1.123.2.6.2.15.2.19
  +++ openssl/apps/s_client.c	30 Dec 2012 00:03:40 -0000	1.123.2.6.2.15.2.20
  @@ -575,7 +575,7 @@
   	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 @@
   #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"));
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]