TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

der flexi decoder: improve CONSTRUCTED type decoding

Browse Source 
remove all teh flags
save the entire original identifier
This commit is contained in:
Steffen Jaeckel 2014-10-06 17:51:25 +02:00
parent 2e426e2d57
commit 3d1231ab15
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pk/asn1/der/sequence/der_decode_sequence_flexi.c
View File

@ -65,7 +65,6 @@ int der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, ltc
ltc_asn1_list *l; ltc_asn1_list *l;
unsigned long err, type, len, totlen, x, y; unsigned long err, type, len, totlen, x, y;
void *realloc_tmp; void *realloc_tmp;
int is_constructed;
LTC_ARGCHK(in != NULL); LTC_ARGCHK(in != NULL);
LTC_ARGCHK(inlen != NULL); LTC_ARGCHK(inlen != NULL);
@ -104,14 +103,10 @@ int der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, ltc
} }
if ((type & 0x20) && (type != 0x30) && (type != 0x31)) { if ((type & 0x20) && (type != 0x30) && (type != 0x31)) {
is_constructed = 1; /* constructed, use the 'used' field to store the original identifier */
/* constructed, use the 'used' field to store the original tag number */ l->used = type;
l->used = (type & 0x1F);
/* treat constructed elements like SETs */ /* treat constructed elements like SETs */
type = 0x31; type = 0x20;
}
else {
is_constructed = 0;
} }
/* now switch on type */ /* now switch on type */
@ -332,11 +327,12 @@ int der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, ltc
} }
break; break;
case 0x20: /* Any CONSTRUCTED element that is neither SEQUENCE nor SET */
case 0x30: /* SEQUENCE */ case 0x30: /* SEQUENCE */
case 0x31: /* SET */ case 0x31: /* SET */
/* init field */ /* init field */
if (is_constructed) { if (type == 0x20) {
l->type = LTC_ASN1_CONSTRUCTED; l->type = LTC_ASN1_CONSTRUCTED;
} }
else if (type == 0x30) { else if (type == 0x30) {