From 06226df1a98205ca451d1322e61ed1bde9dc05b5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 7 Mar 2010 16:40:19 +0000 Subject: [PATCH 1/1] The OID sanity check was incorrect. It should only disallow *leading* 0x80 values. --- crypto/asn1/a_object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index bd2d5a2d82..e5fbe7cbb1 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -290,12 +290,12 @@ ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, const unsigned char *p; unsigned char *data; int i; - /* Sanity check OID encoding: can't have 0x80 in subidentifiers, see: - * X.690 8.19.2 + /* Sanity check OID encoding: can't have leading 0x80 in + * subidentifiers, see: X.690 8.19.2 */ for (i = 0, p = *pp + 1; i < len - 1; i++, p++) { - if (*p == 0x80) + if (*p == 0x80 && (!i || !(p[-1] & 0x80))) { ASN1err(ASN1_F_C2I_ASN1_OBJECT,ASN1_R_INVALID_OBJECT_ENCODING); return NULL; -- 2.34.1