commit df364297495e1d7409f1fcb0f4432c8671019cd8
author FdaSilvaYY <fdasilvayy@gmail.com> Sat Dec 09 15:49:13 2017 +0100
committer FdaSilvaYY <fdasilvayy@gmail.com> Sat Dec 09 23:59:56 2017 +0100
tree 2e86878d49db7caa8c70cf0eee8601efacac79f0
parent 397e23f8db5aecfaef4d470b0c421d2cd84da6f7

Useless conf != NULL test

check is already made 10 line above.
clean commented code

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4885)

apps/ca.c

diff --git a/apps/ca.c b/apps/ca.c
index d08db6b..ea2750a 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -442,29 +442,22 @@
         && (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;
+    p = NCONF_get_string(conf, NULL, "oid_file");
+    if (p == NULL)
+        ERR_clear_error();
+    if (p != NULL) {
+        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);
-                BIO_free(oid_bio);
-            }
+        if (oid_bio == NULL) {
+            ERR_clear_error();
+        } else {
+            OBJ_create_objects(oid_bio);
+            BIO_free(oid_bio);
         }
-        if (!add_oid_section(conf)) {
-            ERR_print_errors(bio_err);
-            goto end;
-        }
+    }
+    if (!add_oid_section(conf)) {
+        ERR_print_errors(bio_err);
+        goto end;
     }
 
     app_RAND_load_conf(conf, BASE_SECTION);