Add missing #ifndefs that caused missing symbols when building libssl

[openssl.git] / apps / asn1pars.c

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index c7e9cf43d8695c630ca75d20b02bde1e5f539b52..e4a9d18ae871833db0db9304f94933825325a8b5 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -86,7 +86,7 @@ int MAIN(int argc, char **argv)
        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;
        char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
        unsigned char *tmpbuf;
        BUF_MEM *buf=NULL;
@@ -130,6 +130,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;
@@ -168,6 +169,8 @@ 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," -i            indent entries\n");
@@ -281,13 +284,14 @@ 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(out,(unsigned char *)&(str[offset]),length,indent))
                {
                ERR_print_errors(bio_err);
                goto end;