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 a18af513955d5da096c99c50beff0ebfe319be38..8b947b8518ad2965311c91a44b2aa7dc561acaf8 100644 (file)
--- 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 41fdf6e7b2cce48af08d77dc90dcfaf99e39106f..76f2e05f5080b9394d72fd2bee4171f3211cba23 100644 (file)
--- 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;
        }