From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 28 Jan 2009 12:36:14 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~52
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=64895732249821b3b0bf3068cbb76464ef5362ba;p=oweals%2Fopenssl.git

Update from stable branch.
---

diff --git a/CHANGES b/CHANGES
index f1b416d445..ba1feb0d2e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -744,6 +744,9 @@
      [NTT]
 
  Changes between 0.9.8j and 0.9.8k  [xx XXX xxxx]
+
+  *) Support NumericString type for name components.
+     [Steve Henson]
   
   *) Allow CC in the environment to override the automatically chosen
      compiler. Note that nothing is done to ensure flags work with the
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index a08ca334a0..26c3a48c6b 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -616,6 +616,7 @@ typedef struct BIT_STRING_BITNAME_st {
 			B_ASN1_GENERALIZEDTIME
 
 #define B_ASN1_PRINTABLE \
+			B_ASN1_NUMERICSTRING| \
 			B_ASN1_PRINTABLESTRING| \
 			B_ASN1_T61STRING| \
 			B_ASN1_IA5STRING| \