Update from stable branch.

diff --git a/CHANGES b/CHANGES
index f1b416d445421521bd5a0b0f91af4e56df58d46e..ba1feb0d2e4b751cc8baf03f4bd8ae12f543ba57 100644 (file)
--- 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 a08ca334a01eb17a948484c1988eb777759d3796..26c3a48c6b606162b82a3fb6c5d3cfbf9ff29f25 100644 (file)
--- 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| \