Basic cleanup in asn1pars.c

Drop extra parentheses, unwrap some lines, compare pointers against NULL.
author: tb <> 2023-03-07 05:53:17 +0000
committer: tb <> 2023-03-07 05:53:17 +0000
commit: 4ed2def591bd0905eecf5872bceda17c300d15b9 (patch)
tree: 4d5f1e79dc42b5d1dc03278861474e458e550fab /src
parent: 3521badc858ffd00d9b2570c4efbe9496f2eafdf (diff)
download: openbsd-4ed2def591bd0905eecf5872bceda17c300d15b9.tar.gz
openbsd-4ed2def591bd0905eecf5872bceda17c300d15b9.tar.bz2
openbsd-4ed2def591bd0905eecf5872bceda17c300d15b9.zip
1 files changed, 16 insertions, 26 deletions
diff --git a/src/usr.bin/openssl/asn1pars.c b/src/usr.bin/openssl/asn1pars.c
index 5824b0ea14..d6364b5564 100644
--- a/src/usr.bin/openssl/asn1pars.c
+++ b/src/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1pars.c,v 1.13 2023/03/06 14:32:05 tb Exp $ */
+/* $OpenBSD: asn1pars.c,v 1.14 2023/03/07 05:53:17 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -267,7 +267,7 @@ asn1parse_main(int argc, char **argv)
        in = BIO_new(BIO_s_file());
        out = BIO_new(BIO_s_file());
-        if ((in == NULL) || (out == NULL)) {
+        if (in == NULL || out == NULL) {
                ERR_print_errors(bio_err);
                goto end;
        }
@@ -291,8 +291,8 @@ asn1parse_main(int argc, char **argv)
                }
        }
-        if (cfg.derfile) {
+        if (cfg.derfile != NULL) {
-                if (!(derout = BIO_new_file(cfg.derfile, "wb"))) {
+                if ((derout = BIO_new_file(cfg.derfile, "wb")) == NULL) {
                        BIO_printf(bio_err, "problems opening %s\n",
                            cfg.derfile);
                        ERR_print_errors(bio_err);
@@ -302,17 +302,15 @@ asn1parse_main(int argc, char **argv)
        if ((buf = BUF_MEM_new()) == NULL)
                goto end;
        if (!BUF_MEM_grow(buf, BUFSIZ * 8))
-                goto end;       /* Pre-allocate :-) */
+                goto end;
-        if (cfg.genstr || cfg.genconf) {
+        if (cfg.genstr != NULL || cfg.genconf) {
-                num = do_generate(bio_err, cfg.genstr,
+                num = do_generate(bio_err, cfg.genstr, cfg.genconf, buf);
-                    cfg.genconf, buf);
                if (num < 0) {
                        ERR_print_errors(bio_err);
                        goto end;
                }
        } else {
                if (cfg.informat == FORMAT_PEM) {
                        BIO *tmp;
@@ -337,21 +335,18 @@ asn1parse_main(int argc, char **argv)
        /* If any structs to parse go through in sequence */
-        if (sk_OPENSSL_STRING_num(cfg.osk)) {
+        if (sk_OPENSSL_STRING_num(cfg.osk) > 0) {
                tmpbuf = (unsigned char *) str;
                tmplen = num;
-                for (i = 0; i < sk_OPENSSL_STRING_num(cfg.osk);
+                for (i = 0; i < sk_OPENSSL_STRING_num(cfg.osk); i++) {
-                     i++) {
                        ASN1_TYPE *atmp;
                        int typ;
-                        j = strtonum(
+                        j = strtonum(sk_OPENSSL_STRING_value(cfg.osk, i),
-                            sk_OPENSSL_STRING_value(cfg.osk, i),
                            1, INT_MAX, &errstr);
                        if (errstr) {
                                BIO_printf(bio_err,
                                    "'%s' is an invalid number: %s\n",
-                                    sk_OPENSSL_STRING_value(cfg.osk,
+                                    sk_OPENSSL_STRING_value(cfg.osk, i), errstr);
-                                    i), errstr);
                                continue;
                        }
                        tmpbuf += j;
@@ -366,8 +361,7 @@ asn1parse_main(int argc, char **argv)
                                goto end;
                        }
                        typ = ASN1_TYPE_get(at);
-                        if ((typ == V_ASN1_OBJECT) ||
+                        if (typ == V_ASN1_OBJECT || typ == V_ASN1_NULL) {
-                            (typ == V_ASN1_NULL)) {
                                BIO_printf(bio_err, "Can't parse %s type\n",
                                    typ == V_ASN1_NULL ? "NULL" : "OBJECT");
                                ERR_print_errors(bio_err);
@@ -386,10 +380,9 @@ asn1parse_main(int argc, char **argv)
        }
        num -= cfg.offset;
-        if ((cfg.length == 0) ||
+        if (cfg.length == 0 || (long)cfg.length > num)
-            ((long)cfg.length > num))
                cfg.length = (unsigned int) num;
-        if (derout) {
+        if (derout != NULL) {
                if (BIO_write(derout, str + cfg.offset,
                    cfg.length) != (int)cfg.length) {
                        BIO_printf(bio_err, "Error writing output\n");
@@ -397,11 +390,8 @@ asn1parse_main(int argc, char **argv)
                        goto end;
                }
        }
-        if (!cfg.noout &&
+        if (!cfg.noout && !ASN1_parse_dump(out,
-            !ASN1_parse_dump(out,
+            (unsigned char *)&str[cfg.offset], cfg.length, cfg.indent, cfg.dump)) {
-            (unsigned char *)&(str[cfg.offset]),
-            cfg.length, cfg.indent,
-            cfg.dump)) {
                ERR_print_errors(bio_err);
                goto end;
        }
author	tb <>	2023-03-07 05:53:17 +0000
committer	tb <>	2023-03-07 05:53:17 +0000
commit	4ed2def591bd0905eecf5872bceda17c300d15b9 (patch)
tree	4d5f1e79dc42b5d1dc03278861474e458e550fab /src
parent	3521badc858ffd00d9b2570c4efbe9496f2eafdf (diff)
download	openbsd-4ed2def591bd0905eecf5872bceda17c300d15b9.tar.gz openbsd-4ed2def591bd0905eecf5872bceda17c300d15b9.tar.bz2 openbsd-4ed2def591bd0905eecf5872bceda17c300d15b9.zip