From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 14 Aug 2002 00:36:44 +0000 (+0000)
Subject: Fix typo in OBJ_txt2obj which incorrectly passed the content
X-Git-Tag: OpenSSL_0_9_6h~121
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1318510f8cfe60c522e93795f326d02d76ea04fe;p=oweals%2Fopenssl.git

Fix typo in OBJ_txt2obj which incorrectly passed the content
length, instead of the encoding length to d2i_ASN1_OBJECT.

This wasn't visible before becuse ASN1_get_object() used
to read past the length of the supplied buffer.
---

diff --git a/CHANGES b/CHANGES
index a18af51395..8b947b8518 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,9 @@
 
  Changes between 0.9.6g and 0.9.6h  [xx XXX xxxx]
 
-  *)
+  *) Fix typo in OBJ_txt2obj which incorrectly passed the content
+     length, instead of the encoding length to d2i_ASN1_OBJECT.
+     [Steve Henson]
 
  Changes between 0.9.6f and 0.9.6g  [9 Aug 2002]
 
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 41fdf6e7b2..76f2e05f50 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -417,7 +417,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
 	a2d_ASN1_OBJECT(p,i,s,-1);
 	
 	p=buf;
-	op=d2i_ASN1_OBJECT(NULL,&p,i);
+	op=d2i_ASN1_OBJECT(NULL,&p,j);
 	OPENSSL_free(buf);
 	return op;
 	}