Handle ASN1_INDEFINITE encoding
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24178 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -67,15 +67,21 @@ decode_heim_any(const unsigned char *p, size_t len,
|
|||||||
return ASN1_OVERFLOW;
|
return ASN1_OVERFLOW;
|
||||||
e = der_get_length(p + l, len - l, &length, &len_len);
|
e = der_get_length(p + l, len - l, &length, &len_len);
|
||||||
if (e) return e;
|
if (e) return e;
|
||||||
if (length + len_len + l > len)
|
if (length == ASN1_INDEFINITE) {
|
||||||
return ASN1_OVERFLOW;
|
if (len < len_len + l)
|
||||||
|
return ASN1_OVERFLOW;
|
||||||
|
length = len - len_len + l;
|
||||||
|
} else {
|
||||||
|
if (length + len_len + l > len)
|
||||||
|
return ASN1_OVERFLOW;
|
||||||
|
}
|
||||||
|
|
||||||
data->data = malloc(length + len_len + l);
|
data->data = malloc(length + len_len + l);
|
||||||
if (data->data == NULL)
|
if (data->data == NULL)
|
||||||
return ENOMEM;
|
return ENOMEM;
|
||||||
data->length = length + len_len + l;
|
data->length = length + len_len + l;
|
||||||
memcpy(data->data, p, length + len_len + l);
|
memcpy(data->data, p, length + len_len + l);
|
||||||
|
|
||||||
if (size)
|
if (size)
|
||||||
*size = length + len_len + l;
|
*size = length + len_len + l;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user