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

Handle BER length encoding.

Browse Source 
Tolerate BER length encoding which may include leading zeroes.

PR#2746
This commit is contained in:
Dr. Stephen Henson 2014-06-28 14:04:36 +01:00
parent a356e488ad
commit 0e7bda79a1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/asn1/asn1_lib.c
View File

@ -170,14 +170,20 @@ static int asn1_get_length(const unsigned char **pp, int *inf, long *rl, int max
i= *p&0x7f; i= *p&0x7f;
if (*(p++) & 0x80) if (*(p++) & 0x80)
{ {
if (max < (int)i)
return 0;
/* Skip leading zeroes */
while (i && *p == 0)
{
p++;
i--;
}
if (i > sizeof(long)) if (i > sizeof(long))
return 0; return 0;
if (max-- == 0) return(0);
while (i-- > 0) while (i-- > 0)
{ {
ret<<=8L; ret<<=8L;
ret|= *(p++); ret|= *(p++);
if (max-- == 0) return(0);
} }
} }
else else