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.
This commit is contained in:
Dr. Stephen Henson
2002-08-14 00:50:35 +00:00
parent d3b282e01f
commit f84acec8ea
2 changed files with 8 additions and 2 deletions

View File

@@ -2,7 +2,7 @@
OpenSSL CHANGES OpenSSL CHANGES
_______________ _______________
Changes between 0.9.6g and 0.9.7 [XX xxx 2002] Changes between 0.9.6h and 0.9.7 [XX xxx 2002]
*) Make sure tests can be performed even if the corresponding algorithms *) Make sure tests can be performed even if the corresponding algorithms
have been removed entirely. This was also the last step to make have been removed entirely. This was also the last step to make
@@ -1667,6 +1667,12 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
*) Clean old EAY MD5 hack from e_os.h. *) Clean old EAY MD5 hack from e_os.h.
[Richard Levitte] [Richard Levitte]
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] Changes between 0.9.6f and 0.9.6g [9 Aug 2002]
*) [In 0.9.6g-engine release:] *) [In 0.9.6g-engine release:]

View File

@@ -425,7 +425,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
a2d_ASN1_OBJECT(p,i,s,-1); a2d_ASN1_OBJECT(p,i,s,-1);
p=buf; p=buf;
op=d2i_ASN1_OBJECT(NULL,&p,i); op=d2i_ASN1_OBJECT(NULL,&p,j);
OPENSSL_free(buf); OPENSSL_free(buf);
return op; return op;
} }