Update from HEAD.

diff --git a/CHANGES b/CHANGES
index accdd8b4ac76f31e0320cdc83f290909527e0bde..d4a46f0aa441ef20c65ca6d732d9f5630d71ef17 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.8j and 0.9.8k  [xx XXX xxxx]
 
+  *) Print out UTF8String and NumericString when parsing ASN1.
+     [Steve Henson]
+
   *) Support NumericString type for name components.
      [Steve Henson]
 

diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index 501b62a4b1993b4a957098f11ac54a262f746ccc..8657f73d66a2cd6a73f68a238443625a1f52c092 100644 (file)
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -213,6 +213,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse
                                (tag == V_ASN1_T61STRING) ||
                                (tag == V_ASN1_IA5STRING) ||
                                (tag == V_ASN1_VISIBLESTRING) ||
+                               (tag == V_ASN1_NUMERICSTRING) ||
+                               (tag == V_ASN1_UTF8STRING) ||
                                (tag == V_ASN1_UTCTIME) ||
                                (tag == V_ASN1_GENERALIZEDTIME))
                                {