giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cope with incomplete ASN.1 data in sc_asn1_read_tag

Browse Source
This commit is contained in:
Frank Morgner 2017-07-11 10:12:17 +02:00
parent deab9cce73
commit 93fa520bc9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libopensc/asn1.c
View File

@ -112,12 +112,15 @@ int sc_asn1_read_tag(const u8 ** buf, size_t buflen, unsigned int *cla_out,
}
len = a;
}
if (len > left)
return SC_ERROR_INVALID_ASN1_OBJECT;
*cla_out = cla;
*tag_out = tag;
*taglen = len;
*buf = p;
if (len > left)
return SC_ERROR_ASN1_END_OF_CONTENTS;
return SC_SUCCESS;
}

4
src/libopensc/pkcs15-pubkey.c
View File

@ -1234,7 +1234,7 @@ sc_pkcs15_read_der_file(sc_context_t *ctx, char * filename,
int r;
int f = -1;
size_t len, offs;
u8 tagbuf[1024]; /* enough to read in the tag and length */
u8 tagbuf[16]; /* enough to read in the tag and length */
u8 * rbuf = NULL;
size_t rbuflen = 0;
const u8 * body = NULL;
@ -1264,7 +1264,7 @@ sc_pkcs15_read_der_file(sc_context_t *ctx, char * filename,
body = tagbuf;
r = sc_asn1_read_tag(&body, len, &cla_out, &tag_out, &bodylen);
if (r != SC_SUCCESS)
if (r != SC_SUCCESS && r != SC_ERROR_ASN1_END_OF_CONTENTS)
goto out;
if (tag_out == SC_ASN1_TAG_EOC || body == NULL) {