Commit 75d0ebef authored by Rich Salz's avatar Rich Salz
Browse files

Dead code clean: #if 0 removal in apps 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent d6fbb194

apps/ca.c

+0 −12
Original line number Diff line number Diff line
@@ -2171,18 +2171,6 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der, 
        (void)i2d_X509_bio(bp, x);

        return;

    }

#if 0

    /* ??? Not needed since X509_print prints all this stuff anyway */

    f = X509_NAME_oneline(X509_get_issuer_name(x), buf, 256);

    BIO_printf(bp, "issuer :%s\n", f);



    f = X509_NAME_oneline(X509_get_subject_name(x), buf, 256);

    BIO_printf(bp, "subject:%s\n", f);



    BIO_puts(bp, "serial :");

    i2a_ASN1_INTEGER(bp, x->cert_info->serialNumber);

    BIO_puts(bp, "\n\n");

#endif

    if (!notext)

        X509_print(bp, x);

    PEM_write_bio_X509(bp, x);

apps/engine.c

+0 −3
Original line number Diff line number Diff line
@@ -196,9 +196,6 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, 
    if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||

        ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,

                            0, NULL, NULL)) <= 0)) {

# if 0

        BIO_printf(bio_out, "%s<no control commands>\n", indent);

# endif

        return 1;

    }

apps/openssl.c

+1 −6
Original line number Diff line number Diff line
@@ -301,12 +301,7 @@ int main(int Argc, char *ARGV[]) 
    }

    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);



#if 0

    if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)

#endif

    {

    CRYPTO_set_locking_callback(lock_dbg_cb);

    }



    if (getenv("OPENSSL_FIPS")) {

#ifdef OPENSSL_FIPS

apps/s_cb.c

+0 −4
Original line number Diff line number Diff line
@@ -812,10 +812,6 @@ void msg_cb(int write_p, int version, int content_type, const void *buf, 


        BIO_printf(bio, "   ");

        num = len;

#if 0

        if (num > 16)

            num = 16;

#endif

        for (i = 0; i < num; i++) {

            if (i % 16 == 0 && i > 0)

                BIO_printf(bio, "\n   ");

apps/s_client.c

+0 −25
Original line number Diff line number Diff line
@@ -1326,10 +1326,6 @@ int MAIN(int argc, char **argv) 


    if (state)

        SSL_CTX_set_info_callback(ctx, apps_ssl_info_callback);

#if 0

    else

        SSL_CTX_set_cipher_list(ctx, getenv("SSL_CIPHER"));

#endif



    SSL_CTX_set_verify(ctx, verify, verify_callback);
@@ -1508,17 +1504,6 @@ int MAIN(int argc, char **argv) 
        SSL_set_tlsext_status_type(con, TLSEXT_STATUSTYPE_ocsp);

        SSL_CTX_set_tlsext_status_cb(ctx, ocsp_resp_cb);

        SSL_CTX_set_tlsext_status_arg(ctx, bio_c_out);

# if 0

        {

            STACK_OF(OCSP_RESPID) *ids = sk_OCSP_RESPID_new_null();

            OCSP_RESPID *id = OCSP_RESPID_new();

            id->value.byKey = ASN1_OCTET_STRING_new();

            id->type = V_OCSP_RESPID_KEY;

            ASN1_STRING_set(id->value.byKey, "Hello World", -1);

            sk_OCSP_RESPID_push(ids, id);

            SSL_set_tlsext_status_ids(con, ids);

        }

# endif

    }

#endif

#ifndef OPENSSL_NO_JPAKE
@@ -1667,16 +1652,6 @@ int MAIN(int argc, char **argv) 
            tty_on = 1;

            if (in_init) {

                in_init = 0;

#if 0                           /* This test doesn't really work as intended

                                 * (needs to be fixed) */

# ifndef OPENSSL_NO_TLSEXT

                if (servername != NULL && !SSL_session_reused(con)) {

                    BIO_printf(bio_c_out,

                               "Server did %sacknowledge servername extension.\n",

                               tlsextcbp.ack ? "" : "not ");

                }

# endif

#endif

                if (sess_out) {

                    BIO *stmp = BIO_new_file(sess_out, "w");

                    if (stmp) {