[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  2d4deb256fb28f53ae778f8cf26698f49c5b83b4 (commit)
      from  7ea9f90d7734f07b5efd9a201e6e3254ce6a920b (commit)


- Log -----------------------------------------------------------------
commit 2d4deb256fb28f53ae778f8cf26698f49c5b83b4
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri May 29 11:38:53 2015 +0100

    fix asn1parse -inform
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/asn1pars.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index bf53a34..24b5568 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -140,7 +140,7 @@ int asn1parse_main(int argc, char **argv)
         case OPT_INFORM:
             if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
                 goto opthelp;
-            goto end;
+            break;
         case OPT_IN:
             infile = opt_arg();
             break;