generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for bug in pkcs12 program and typo in ASN1_tag2str().

Browse Source
This commit is contained in:
Dr. Stephen Henson
1999-10-05 13:10:21 +00:00
parent 2d681b779c
commit d71c6bc5a4
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -4,6 +4,11 @@
Changes between 0.9.4 and 0.9.5 [xx XXX 1999] Changes between 0.9.4 and 0.9.5 [xx XXX 1999]
*) New -noout option to asn1parse. This causes no output to be produced
its main use is when combined with -strparse and -out to extract data
from a file (which may not be in ASN.1 format).
[Steve Henson]
*) Fix for pkcs12 program. It was hashing an invalid certificate pointer *) Fix for pkcs12 program. It was hashing an invalid certificate pointer
when producing the local key id. when producing the local key id.
[Richard Levitte <levitte@stacken.kth.se>] [Richard Levitte <levitte@stacken.kth.se>]

8
apps/asn1pars.c
View File

@@ -86,7 +86,7 @@ int MAIN(int argc, char **argv)
unsigned int length=0; unsigned int length=0;
long num,tmplen; long num,tmplen;
BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL; 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; char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
unsigned char *tmpbuf; unsigned char *tmpbuf;
BUF_MEM *buf=NULL; BUF_MEM *buf=NULL;
@@ -130,6 +130,7 @@ int MAIN(int argc, char **argv)
{ {
indent=1; indent=1;
} }
else if (strcmp(*argv,"-noout") == 0) noout = 1;
else if (strcmp(*argv,"-oid") == 0) else if (strcmp(*argv,"-oid") == 0)
{ {
if (--argc < 1) goto bad; if (--argc < 1) goto bad;
@@ -168,6 +169,8 @@ bad:
BIO_printf(bio_err,"where options are\n"); 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," -inform arg input format - one of DER TXT PEM\n");
BIO_printf(bio_err," -in arg input file\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," -offset arg offset into file\n");
BIO_printf(bio_err," -length arg lenth of section in file\n"); BIO_printf(bio_err," -length arg lenth of section in file\n");
BIO_printf(bio_err," -i indent entries\n"); BIO_printf(bio_err," -i indent entries\n");
@@ -287,7 +290,8 @@ bad:
goto end; 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); ERR_print_errors(bio_err);
goto end; goto end;