Commit 9fa36f5f authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove some commented out code in the apps 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2774)
parent 816060d2

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -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] */

apps/s_cb.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

apps/s_client.c

+0 −6
Original line number Diff line number Diff line
@@ -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 */