Commit df364297 authored by FdaSilvaYY's avatar FdaSilvaYY
Browse files

Useless conf != NULL test 



check is already made 10 line above.
clean commented code

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4885)
parent 397e23f8

apps/ca.c

+14 −21
Original line number Diff line number Diff line
@@ -442,19 +442,13 @@ end_of_options: 
        && (section = lookup_conf(conf, BASE_SECTION, ENV_DEFAULT_CA)) == NULL)

        goto end;



    if (conf != NULL) {

    p = NCONF_get_string(conf, NULL, "oid_file");

    if (p == NULL)

        ERR_clear_error();

    if (p != NULL) {

            BIO *oid_bio;

        BIO *oid_bio = BIO_new_file(p, "r");



            oid_bio = BIO_new_file(p, "r");

        if (oid_bio == NULL) {

                /*-

                BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);

                ERR_print_errors(bio_err);

                */

            ERR_clear_error();

        } else {

            OBJ_create_objects(oid_bio);
@@ -465,7 +459,6 @@ end_of_options: 
        ERR_print_errors(bio_err);

        goto end;

    }

    }



    app_RAND_load_conf(conf, BASE_SECTION);