root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove some commented out code in the apps 

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2774)
This commit is contained in:
Matt Caswell 2017-02-28 12:46:56 +00:00
parent 816060d212
commit 9fa36f5f4b
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ca.c
View File

@ -2132,7 +2132,7 @@ static int get_certificate_status(const char *serial, CA_DB *db)
if (serial_len % 2) { if (serial_len % 2) {
/* /*
* Set the first char to 0 * Set the first char to 0
*/ ; */
row[DB_serial][0] = '0'; row[DB_serial][0] = '0';
/* Copy String from serial to row[DB_serial] */ /* Copy String from serial to row[DB_serial] */

1
apps/s_cb.c
View File

@ -1096,7 +1096,6 @@ void print_ssl_summary(SSL *s)
{ {
const SSL_CIPHER *c; const SSL_CIPHER *c;
X509 *peer; X509 *peer;
/* const char *pnam = SSL_is_server(s) ? "client" : "server"; */
BIO_printf(bio_err, "Protocol version: %s\n", SSL_get_version(s)); BIO_printf(bio_err, "Protocol version: %s\n", SSL_get_version(s));
print_raw_cipherlist(s); print_raw_cipherlist(s);

6
apps/s_client.c
View File

@ -136,9 +136,6 @@ static void do_ssl_shutdown(SSL *ssl)
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
/* Default PSK identity and key */ /* Default PSK identity and key */
static char *psk_identity = "Client_identity"; static char *psk_identity = "Client_identity";
/*
* char *psk_key=NULL; by default PSK is not used
*/
static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity, static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
unsigned int max_identity_len, unsigned int max_identity_len,
@ -2405,7 +2402,6 @@ int s_client_main(int argc, char **argv)
BIO_printf(bio_err, "bad select %d\n", BIO_printf(bio_err, "bad select %d\n",
get_last_socket_error()); get_last_socket_error());
goto shut; goto shut;
/* goto end; */
} }
} }
@ -2496,7 +2492,6 @@ int s_client_main(int argc, char **argv)
BIO_printf(bio_c_out, "DONE\n"); BIO_printf(bio_c_out, "DONE\n");
ret = 0; ret = 0;
goto shut; goto shut;
/* goto end; */
} }
sbuf_len -= i; sbuf_len -= i;
@ -2566,7 +2561,6 @@ int s_client_main(int argc, char **argv)
case SSL_ERROR_SSL: case SSL_ERROR_SSL:
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
goto shut; goto shut;
/* break; */
} }
} }
/* OPENSSL_SYS_MSDOS includes OPENSSL_SYS_WINDOWS */ /* OPENSSL_SYS_MSDOS includes OPENSSL_SYS_WINDOWS */