This commits the changes to STACK macros forced by recent ENGINE surgery.

[openssl.git] / apps / asn1pars.c

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index c7e9cf43d8695c630ca75d20b02bde1e5f539b52..4918bcb1c0654d5a90de194a8e91db7ac5f0f8ac 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -74,19 +74,21 @@
  * -i          - indent the details by depth
  * -offset     - where in the file to start
  * -length     - how many bytes to use
- * -oid file   - extra oid decription file
+ * -oid file   - extra oid description file
  */
 
 #undef PROG
 #define PROG   asn1parse_main
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,badops=0,offset=0,ret=1,j;
        unsigned int length=0;
        long num,tmplen;
        BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
-       int informat,indent=0;
+       int informat,indent=0, noout = 0, dump = 0;
        char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
        unsigned char *tmpbuf;
        BUF_MEM *buf=NULL;
@@ -106,7 +108,7 @@ int MAIN(int argc, char **argv)
        argv++;
        if ((osk=sk_new_null()) == NULL)
                {
-               BIO_printf(bio_err,"Malloc failure\n");
+               BIO_printf(bio_err,"Memory allocation failure\n");
                goto end;
                }
        while (argc >= 1)
@@ -130,6 +132,7 @@ int MAIN(int argc, char **argv)
                        {
                        indent=1;
                        }
+               else if (strcmp(*argv,"-noout") == 0) noout = 1;
                else if (strcmp(*argv,"-oid") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -146,6 +149,16 @@ int MAIN(int argc, char **argv)
                        length= atoi(*(++argv));
                        if (length == 0) goto bad;
                        }
+               else if (strcmp(*argv,"-dump") == 0)
+                       {
+                       dump= -1;
+                       }
+               else if (strcmp(*argv,"-dlimit") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       dump= atoi(*(++argv));
+                       if (dump <= 0) goto bad;
+                       }
                else if (strcmp(*argv,"-strparse") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -168,9 +181,13 @@ bad:
                BIO_printf(bio_err,"where options are\n");
                BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");
                BIO_printf(bio_err," -in arg       input file\n");
+               BIO_printf(bio_err," -out arg      output file\n");
+               BIO_printf(bio_err," -noout arg    don't produce any output\n");
                BIO_printf(bio_err," -offset arg   offset into file\n");
-               BIO_printf(bio_err," -length arg   lenth of section in file\n");
+               BIO_printf(bio_err," -length arg   length of section in file\n");
                BIO_printf(bio_err," -i            indent entries\n");
+               BIO_printf(bio_err," -dump         dump unknown data in hex form\n");
+               BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
                BIO_printf(bio_err," -oid file     file of extra oid definitions\n");
                BIO_printf(bio_err," -strparse offset\n");
                BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
@@ -189,6 +206,12 @@ bad:
                goto end;
                }
        BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
+#ifdef OPENSSL_SYS_VMS
+       {
+       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+       out = BIO_push(tmpbio, out);
+       }
+#endif
 
        if (oidfile != NULL)
                {
@@ -281,13 +304,15 @@ bad:
 
        if (length == 0) length=(unsigned int)num;
        if(derout) {
-               if(BIO_write(derout, str + offset, length) != length) {
+               if(BIO_write(derout, str + offset, length) != (int)length) {
                        BIO_printf(bio_err, "Error writing output\n");
                        ERR_print_errors(bio_err);
                        goto end;
                }
        }
-       if (!ASN1_parse(out,(unsigned char *)&(str[offset]),length,indent))
+       if (!noout &&
+           !ASN1_parse_dump(out,(unsigned char *)&(str[offset]),length,
+                   indent,dump))
                {
                ERR_print_errors(bio_err);
                goto end;
@@ -296,7 +321,7 @@ bad:
 end:
        BIO_free(derout);
        if (in != NULL) BIO_free(in);
-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);
        if (b64 != NULL) BIO_free(b64);
        if (ret != 0)
                ERR_print_errors(bio_err);
@@ -304,6 +329,7 @@ end:
        if (at != NULL) ASN1_TYPE_free(at);
        if (osk != NULL) sk_free(osk);
        OBJ_cleanup();
+       apps_shutdown();
        EXIT(ret);
        }