diff --git a/lib/asn1/extra.c b/lib/asn1/extra.c
index 49240605c..c01e8a4cd 100644
--- a/lib/asn1/extra.c
+++ b/lib/asn1/extra.c
@@ -67,15 +67,21 @@ decode_heim_any(const unsigned char *p, size_t len,
 	return ASN1_OVERFLOW;
     e = der_get_length(p + l, len - l, &length, &len_len);
     if (e) return e;
-    if (length + len_len + l > len)
-	return ASN1_OVERFLOW;
-
+    if (length == ASN1_INDEFINITE) {
+	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);
     if (data->data == NULL)
 	return ENOMEM;
     data->length = length + len_len + l;
     memcpy(data->data, p, length + len_len + l);
-
+    
     if (size)
 	*size = length + len_len + l;