removed unneeded types.

diff --git a/lib/pkix.asn b/lib/pkix.asn
index cc788b73a1bb139a297ddd56d96c17add970dfb5..c468dcea05c26e7f22371b29be2dac65ec4a7fd9 100644 (file)
--- a/lib/pkix.asn
+++ b/lib/pkix.asn
@@ -126,29 +126,6 @@ AccessDescription  ::=  SEQUENCE {
 --  EXPLICIT
 -- --------------------------------------
 
--- UNIVERSAL Types defined in '93 and '98 ASN.1
--- but required by this specification
-
-NumericString ::= [UNIVERSAL 18] IMPLICIT OCTET STRING
-
-IA5String ::= [UNIVERSAL 22] IMPLICIT OCTET STRING
-
-TeletexString ::= [UNIVERSAL 20] IMPLICIT OCTET STRING
-
-PrintableString ::= [UNIVERSAL 19] IMPLICIT OCTET STRING
-
-UniversalString ::= [UNIVERSAL 28] IMPLICIT OCTET STRING
-        -- UniversalString is defined in ASN.1:1993
-
-BMPString ::= [UNIVERSAL 30] IMPLICIT OCTET STRING
-      -- BMPString is the subtype of UniversalString and models
-       -- the Basic Multilingual Plane of ISO/IEC/ITU 10646-1
-
-UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
-        -- The content of this type conforms to RFC 2279.
-
-VisibleString ::= [UNIVERSAL 26] IMPLICIT OCTET STRING
-
 -- attribute data types --
 
 Attribute       ::=     SEQUENCE {

diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c
index afa6a77c26146d87a65a8d37708a48addc92e23c..daa5e4c263096fda48c263d64f3d19f3b7c642a8 100644 (file)
--- a/lib/pkix_asn1_tab.c
+++ b/lib/pkix_asn1_tab.c
@@ -103,22 +103,6 @@ const asn1_static_node pkix_asn1_tab[] = {
   { "AccessDescription", 1610612741, NULL },
   { "accessMethod", 1073741836, NULL },
   { "accessLocation", 2, "GeneralName"},
-  { "NumericString", 1610620935, NULL },
-  { NULL, 4360, "18"},
-  { "IA5String", 1610620935, NULL },
-  { NULL, 4360, "22"},
-  { "TeletexString", 1610620935, NULL },
-  { NULL, 4360, "20"},
-  { "PrintableString", 1610620935, NULL },
-  { NULL, 4360, "19"},
-  { "UniversalString", 1610620935, NULL },
-  { NULL, 4360, "28"},
-  { "BMPString", 1610620935, NULL },
-  { NULL, 4360, "30"},
-  { "UTF8String", 1610620935, NULL },
-  { NULL, 4360, "12"},
-  { "VisibleString", 1610620935, NULL },
-  { NULL, 4360, "26"},
   { "Attribute", 1610612741, NULL },
   { "type", 1073741826, "AttributeType"},
   { "values", 536870927, NULL },