Commit 7ed485bc authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

The OID sanity check was incorrect. It should only disallow *leading* 0x80 

values.
parent 069d4cfe

apps/x509.c

+1 −0
Original line number Diff line number Diff line
@@ -904,6 +904,7 @@ bad: 
			else if (text == i)

				{

				X509_print_ex(out,x,nmflag, certflag);

ERR_print_errors_fp(stderr);

				}

			else if (startdate == i)

				{

crypto/asn1/a_object.c

+3 −3
Original line number Diff line number Diff line
@@ -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;