diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-28 12:46:56 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-02-28 16:02:11 +0000 |
| commit | 9fa36f5f4b32557c20b2c2665d50b239dcc49b91 (patch) | |
| tree | 8a4ad2fa71e2bb9e2ba0b6f8b91f22f4bda02d74 | |
| parent | 816060d212ad3f7bbfbd4444b2b7ffb8fc24f62e (diff) | |
| download | openssl-9fa36f5f4b32557c20b2c2665d50b239dcc49b91.tar.gz | |
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)
| -rw-r--r-- | apps/ca.c | 2 | ||||
| -rw-r--r-- | apps/s_cb.c | 1 | ||||
| -rw-r--r-- | apps/s_client.c | 6 |
3 files changed, 1 insertions, 8 deletions
@@ -2132,7 +2132,7 @@ static int get_certificate_status(const char *serial, CA_DB *db) if (serial_len % 2) { /* * Set the first char to 0 - */ ; + */ row[DB_serial][0] = '0'; /* Copy String from serial to row[DB_serial] */ diff --git a/apps/s_cb.c b/apps/s_cb.c index 080fc59c87..50bd965dd1 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -1096,7 +1096,6 @@ void print_ssl_summary(SSL *s) { const SSL_CIPHER *c; X509 *peer; - /* const char *pnam = SSL_is_server(s) ? "client" : "server"; */ BIO_printf(bio_err, "Protocol version: %s\n", SSL_get_version(s)); print_raw_cipherlist(s); diff --git a/apps/s_client.c b/apps/s_client.c index 4db3748f30..6e790cf8fb 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -136,9 +136,6 @@ static void do_ssl_shutdown(SSL *ssl) #ifndef OPENSSL_NO_PSK /* Default PSK identity and key */ 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, 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", get_last_socket_error()); goto shut; - /* goto end; */ } } @@ -2496,7 +2492,6 @@ int s_client_main(int argc, char **argv) BIO_printf(bio_c_out, "DONE\n"); ret = 0; goto shut; - /* goto end; */ } sbuf_len -= i; @@ -2566,7 +2561,6 @@ int s_client_main(int argc, char **argv) case SSL_ERROR_SSL: ERR_print_errors(bio_err); goto shut; - /* break; */ } } /* OPENSSL_SYS_MSDOS includes OPENSSL_SYS_WINDOWS */ |