oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Allow trailing NULs. We allow this since MIT Kerberos sends an strings

Browse Source 
in the NEED_PREAUTH case that includes a trailing NUL.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20296 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-04-11 11:09:37 +00:00
parent 7a0820554b
commit 2e356b6607
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/asn1/der_get.c
View File

@@ -135,14 +135,25 @@ int
der_get_general_string (const unsigned char *p, size_t len, der_get_general_string (const unsigned char *p, size_t len,
heim_general_string *str, size_t *size) heim_general_string *str, size_t *size)
{ {
const unsigned char *p1;
char *s; char *s;
p1 = memchr(p, 0, len);
if (p1 != NULL) {
/*
* Allow trailing NULs. We allow this since MIT Kerberos sends
* an strings in the NEED_PREAUTH case that includes a
* trailing NUL.
*/
len = p1 - p;
while (*p1 == '\0' && p1 - p < len)
p1++;
if (p1 - p != len + 1)
return ASN1_BAD_CHARACTER;
}
if (len > len + 1) if (len > len + 1)
return ASN1_BAD_LENGTH; return ASN1_BAD_LENGTH;
if (memchr(p, 0, len) != NULL)
return ASN1_BAD_CHARACTER;
s = malloc (len + 1); s = malloc (len + 1);
if (s == NULL) if (s == NULL)
return ENOMEM; return ENOMEM;