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.

diff --git a/CHANGES b/CHANGES
index 7a4d64c1b24dc360dff7e93a921f6577fd629d65..229351b119a7dea64b9e885ceb16d7e9f63c1268 100644 (file)
--- 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 0ae77daaf38afb56018ee37e166718f5706ed96f..5054ffd30c9d68b06846df5b4e861f6fbc86a72d 100644 (file)
--- 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 ebeb243d80dcfd12ef7588b0fd0be9c8b2949c95..5043daef2a20bfb1f1beb69cb62c58d2cae48be7 100644 (file)
--- 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;