[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  e58c4d3cdde7a0a01df2884bfeec31a2b07be22d (commit)
      from  f4bd5de54459cc5f873807c7ed1f1b04b6e8d7e3 (commit)


- Log -----------------------------------------------------------------
commit e58c4d3cdde7a0a01df2884bfeec31a2b07be22d
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Oct 6 14:15:14 2015 +0100

    Don't try and parse boolean type.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/asn1pars.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 89afd5b..574b03f 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -279,9 +279,9 @@ int asn1parse_main(int argc, char **argv)
             }
             typ = ASN1_TYPE_get(at);
             if ((typ == V_ASN1_OBJECT)
+                || (typ == V_ASN1_BOOLEAN)
                 || (typ == V_ASN1_NULL)) {
-                BIO_printf(bio_err, "Can't parse %s type\n",
-                           typ == V_ASN1_NULL ? "NULL" : "OBJECT");
+                BIO_printf(bio_err, "Can't parse %s type\n", ASN1_tag2str(typ));
                 ERR_print_errors(bio_err);
                 goto end;
             }