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

Added -strictpem parameter to enable processing of PEM files with data prior to the BEGIN marker

Browse Source
This commit is contained in:
Matt Caswell
2014-05-26 17:16:43 +01:00
parent 487dac87e3
commit 6b5c1d940b
2 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apps/asn1pars.c
View File

@@ -80,6 +80,9 @@
#undef PROG
#define PROG asn1parse_main
/* Minimum buffer size to be used */
#define MIN_BUFFER 256
int MAIN(int, char **);
static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
@@ -90,7 +93,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, noout = 0, dump = 0;
int informat,indent=0, noout = 0, dump = 0, strictpem = 0;
char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
char *genstr=NULL, *genconf=NULL;
unsigned char *tmpbuf;
@@ -181,6 +184,11 @@ int MAIN(int argc, char **argv)
if (--argc < 1) goto bad;
genconf= *(++argv);
}
else if (strcmp(*argv,"-strictpem") == 0)
{
strictpem = 1;
informat = FORMAT_PEM;
}
else
{
BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -211,6 +219,8 @@ bad:
BIO_printf(bio_err," ASN1 blob wrappings\n");
BIO_printf(bio_err," -genstr str string to generate ASN1 structure from\n");
BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
BIO_printf(bio_err," -strictpem do not attempt base64 decode outside PEM markers (-inform \n");
BIO_printf(bio_err," will be ignored)\n");
goto end;
}
@@ -262,7 +272,7 @@ bad:
}
if ((buf=BUF_MEM_new()) == NULL) goto end;
if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
if (!BUF_MEM_grow(buf,(BUFSIZ*8)<MIN_BUFFER?MIN_BUFFER:(BUFSIZ*8))) goto end; /* Pre-allocate :-) */
if (genstr || genconf)
{
@@ -281,6 +291,38 @@ bad:
{
BIO *tmp;
if(strictpem)
{
for (;;)
{
/* Read a line */
i=BIO_gets(in,buf->data,MIN_BUFFER-1);
if (i <= 0)
{
BIO_printf(bio_err, "Error: Cannot find start line\n");
goto end;
}
/* Strip trailing spaces etc */
do
i--;
while ((i >= 0) && (buf->data[i] <= ' '));
buf->data[++i]='\0';
/* Check if we have a PEM BEGIN marker */
if (strncmp(buf->data,"-----BEGIN ",11) == 0)
{
if (strncmp(&(buf->data[i-5]),"-----",5) != 0)
continue;
break;
}
}
}
if ((b64=BIO_new(BIO_f_base64())) == NULL)
goto end;
BIO_push(b64,in);