aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-02-13 17:15:32 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-02-13 17:15:32 +0000
commite4119b931172a6a28e2ecb65ef41c6f23b89d09c (patch)
tree5467ca9197750aa48bfa55618e5906333f60de92
parent4a71b90debd3db4bade3792d249272e2e52b2016 (diff)
downloadopenssl-e4119b931172a6a28e2ecb65ef41c6f23b89d09c.tar.gz
Fix typo in asn1.h (PRINTABLESTRING_STRING) and fix a bug in object creation
perl script. It failed if the OID had any zeros in it.
-rw-r--r--CHANGES7
-rw-r--r--crypto/asn1/asn1.h2
-rw-r--r--crypto/objects/obj_dat.pl2
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 7a4d64c1b2..229351b119 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,12 @@
Changes between 0.9.1c and 0.9.2
+ *) Fix for a typo in asn1.h. Bug fix to object creation script
+ obj_dat.pl. It considered a zero in an object definition to mean
+ "end of object": none of the objects in objects.h have any zeros
+ so it wasn't spotted.
+ [Steve Henson, reported by Erwann ABALEA <eabalea@certplus.com>]
+
*) Add support for Triple DES Cipher Block Chaining with Output Feedback
Masking (CBCM). In the absence of test vectors, the best I have been able
to do is check that the decrypt undoes the encrypt, so far. Send me test
@@ -22,6 +28,7 @@
If you do a:
perl util/mkdef.pl crypto ssl update
it will update them.
+ [Steve Henson]
*) Overhauled the Perl interface (perl/*):
- ported BN stuff to OpenSSL's different BN library
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 0ae77daaf3..5054ffd30c 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -305,7 +305,7 @@ typedef struct asn1_header_st
B_ASN1_BMPSTRING|\
B_ASN1_UNKNOWN)
-#define ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING_STRING *)\
+#define ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
#define ASN1_PRINTABLESTRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)
#define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
diff --git a/crypto/objects/obj_dat.pl b/crypto/objects/obj_dat.pl
index ebeb243d80..5043daef2a 100644
--- a/crypto/objects/obj_dat.pl
+++ b/crypto/objects/obj_dat.pl
@@ -252,7 +252,7 @@ sub der_it
$ret.=pack("C*",$a[0]*40+$a[1]);
shift @a;
shift @a;
- while ($_=shift(@a))
+ foreach (@a)
{
@r=();
$t=0;