summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-01-28 12:36:14 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-01-28 12:36:14 +0000
commit64895732249821b3b0bf3068cbb76464ef5362ba (patch)
tree301cde2d3abf65ca6f485ec64a60ad1f4af9aa28
parent079e00e646ffe61c2373b1bf2282c8a4ca21f776 (diff)
Update from stable branch.
-rw-r--r--CHANGES3
-rw-r--r--crypto/asn1/asn1.h1
2 files changed, 4 insertions, 0 deletions
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| \