Added more verbose debugging info

4 files changed, 22 insertions, 1391 deletions

diff --git a/lib/pkix.asn b/lib/pkix.asn
index d46dfa0769..821cd0a5a9 100644
--- a/lib/pkix.asn
+++ b/lib/pkix.asn
@@ -9,13 +9,8 @@ BEGIN
 
 -- ISO arc for standard certificate and CRL extensions
 
-id-ce OBJECT IDENTIFIER  ::=  {joint-iso-ccitt(2) ds(5) 29}
-
-
 -- authority key identifier OID and syntax
 
-id-ce-authorityKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 35 }
-
 AuthorityKeyIdentifier ::= SEQUENCE {
       keyIdentifier             [0] KeyIdentifier            OPTIONAL,
       authorityCertIssuer       [1] GeneralNames             OPTIONAL,
@@ -27,85 +22,11 @@ KeyIdentifier ::= OCTET STRING
 
 -- subject key identifier OID and syntax
 
-id-ce-subjectKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 14 }
-
 SubjectKeyIdentifier ::= KeyIdentifier
 
 -- key usage extension OID and syntax
 
-id-ce-keyUsage OBJECT IDENTIFIER ::=  { id-ce 15 }
-
-KeyUsage ::= BIT STRING {
-     digitalSignature        (0),
-     nonRepudiation          (1),
-     keyEncipherment         (2),
-     dataEncipherment        (3),
-     keyAgreement            (4),
-     keyCertSign             (5),
-     cRLSign                 (6),
-     encipherOnly            (7),
-     decipherOnly            (8) }
-
--- private key usage period extension OID and syntax
-
-id-ce-privateKeyUsagePeriod OBJECT IDENTIFIER ::=  { id-ce 16 }
-
-PrivateKeyUsagePeriod ::= SEQUENCE {
-     notBefore       [0]     GeneralizedTime OPTIONAL,
-     notAfter        [1]     GeneralizedTime OPTIONAL }
-     -- either notBefore or notAfter shall be present
-
--- certificate policies extension OID and syntax
-
-id-ce-certificatePolicies OBJECT IDENTIFIER ::=  { id-ce 32 }
-
-CertificatePolicies ::= SEQUENCE SIZE (1..MAX) OF PolicyInformation
-
-PolicyInformation ::= SEQUENCE {
-     policyIdentifier   CertPolicyId,
-     policyQualifiers   SEQUENCE SIZE (1..MAX) OF
-             PolicyQualifierInfo OPTIONAL }
-
-CertPolicyId ::= OBJECT IDENTIFIER
-
-PolicyQualifierInfo ::= SEQUENCE {
-       policyQualifierId  PolicyQualifierId,
-       qualifier        ANY DEFINED BY policyQualifierId }
-
--- Implementations that recognize additional policy qualifiers shall
--- augment the following definition for PolicyQualifierId
-
-PolicyQualifierId ::=
-    OBJECT IDENTIFIER  -- ( id-qt-cps | id-qt-unotice )
-
--- CPS pointer qualifier
-
-CPSuri ::= IA5String
-
--- user notice qualifier
-
-UserNotice ::= SEQUENCE {
-     noticeRef        NoticeReference OPTIONAL,
-     explicitText     DisplayText OPTIONAL}
-
-NoticeReference ::= SEQUENCE {
-     organization     DisplayText,
-     noticeNumbers    SEQUENCE OF INTEGER }
-
-DisplayText ::= CHOICE {
-     visibleString    VisibleString  (SIZE (1..200)),
-     bmpString        BMPString      (SIZE (1..200)),
-     utf8String       UTF8String     (SIZE (1..200)) }
-
--- policy mapping extension OID and syntax
-
-id-ce-policyMappings OBJECT IDENTIFIER ::=  { id-ce 33 }
-
-PolicyMappings ::= SEQUENCE SIZE (1..MAX) OF SEQUENCE {
-     issuerDomainPolicy      CertPolicyId,
-     subjectDomainPolicy     CertPolicyId }
-
--- subject alternative name extension OID and syntax
+KeyUsage ::= BIT STRING
 
 -- Directory string type --
 
@@ -120,8 +41,6 @@ DirectoryString ::= CHOICE {
       -- so if it causes problems, considering dropping it. --
       ia5String               IA5String (SIZE(1..MAX)) }
 
-id-ce-subjectAltName OBJECT IDENTIFIER ::=  { id-ce 17 }
-
 SubjectAltName ::= GeneralNames
 
 GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
@@ -130,10 +49,10 @@ GeneralName ::= CHOICE {
      otherName                       [0]     AnotherName,
      rfc822Name                      [1]     IA5String,
      dNSName                         [2]     IA5String,
-     x400Address                     [3]     ORAddress,
+     x400Address                     [3]     ANY,
 -- Changed to work with the libtasn1 parser.
      directoryName                   [4]     EXPLICIT RDNSequence, --Name,
-     ediPartyName                    [5]     EDIPartyName,
+     ediPartyName                    [5]     ANY, --EDIPartyName replaced by ANY to save memory
      uniformResourceIdentifier       [6]     IA5String,
      iPAddress                       [7]     OCTET STRING,
      registeredID                    [8]     OBJECT IDENTIFIER }
@@ -145,59 +64,18 @@ AnotherName ::= SEQUENCE {
      type-id    OBJECT IDENTIFIER,
      value      [0] EXPLICIT ANY DEFINED BY type-id }
 
-EDIPartyName ::= SEQUENCE {
-     nameAssigner            [0]     DirectoryString OPTIONAL,
-     partyName               [1]     DirectoryString }
-
 -- issuer alternative name extension OID and syntax
 
-id-ce-issuerAltName OBJECT IDENTIFIER ::=  { id-ce 18 }
-
 IssuerAltName ::= GeneralNames
 
-id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::=  { id-ce 9 }
-
-SubjectDirectoryAttributes ::= SEQUENCE SIZE (1..MAX) OF Attribute
-
 -- basic constraints extension OID and syntax
 
-id-ce-basicConstraints OBJECT IDENTIFIER ::=  { id-ce 19 }
-
 BasicConstraints ::= SEQUENCE {
      cA                      BOOLEAN DEFAULT FALSE,
      pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
 
--- name constraints extension OID and syntax
-
-id-ce-nameConstraints OBJECT IDENTIFIER ::=  { id-ce 30 }
-
-NameConstraints ::= SEQUENCE {
-     permittedSubtrees       [0]     GeneralSubtrees OPTIONAL,
-     excludedSubtrees        [1]     GeneralSubtrees OPTIONAL }
-
-GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
-
-GeneralSubtree ::= SEQUENCE {
-     base                    GeneralName,
-     minimum         [0]     BaseDistance DEFAULT 0,
-     maximum         [1]     BaseDistance OPTIONAL }
-
-BaseDistance ::= INTEGER (0..MAX)
-
--- policy constraints extension OID and syntax
-
-id-ce-policyConstraints OBJECT IDENTIFIER ::=  { id-ce 36 }
-
-PolicyConstraints ::= SEQUENCE {
-     requireExplicitPolicy           [0] SkipCerts OPTIONAL,
-     inhibitPolicyMapping            [1] SkipCerts OPTIONAL }
-
-SkipCerts ::= INTEGER (0..MAX)
-
 -- CRL distribution points extension OID and syntax
 
-id-ce-cRLDistributionPoints     OBJECT IDENTIFIER  ::=  {id-ce 31}
-
 CRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
 
 DistributionPoint ::= SEQUENCE {
@@ -211,117 +89,22 @@ DistributionPointName ::= CHOICE {
     nameRelativeToCRLIssuer [1]     RelativeDistinguishedName 
 }
 
-ReasonFlags ::= BIT STRING {
-     unused                  (0),
-     keyCompromise           (1),
-     cACompromise            (2),
-     affiliationChanged      (3),
-     superseded              (4),
-     cessationOfOperation    (5),
-     certificateHold         (6),
-     privilegeWithdrawn      (7),
-     aACompromise            (8) }
+ReasonFlags ::= BIT STRING
 
 -- extended key usage extension OID and syntax
 
-id-ce-extKeyUsage OBJECT IDENTIFIER ::= {id-ce 37}
-
 ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
 
 KeyPurposeId ::= OBJECT IDENTIFIER
 
--- extended key purpose OIDs
-id-kp-serverAuth      OBJECT IDENTIFIER ::= { id-kp 1 }
-id-kp-clientAuth      OBJECT IDENTIFIER ::= { id-kp 2 }
-id-kp-codeSigning     OBJECT IDENTIFIER ::= { id-kp 3 }
-id-kp-emailProtection OBJECT IDENTIFIER ::= { id-kp 4 }
-id-kp-ipsecEndSystem  OBJECT IDENTIFIER ::= { id-kp 5 }
-id-kp-ipsecTunnel     OBJECT IDENTIFIER ::= { id-kp 6 }
-id-kp-ipsecUser       OBJECT IDENTIFIER ::= { id-kp 7 }
-id-kp-timeStamping    OBJECT IDENTIFIER ::= { id-kp 8 }
-
--- authority info access
-
-id-pe-authorityInfoAccess OBJECT IDENTIFIER ::= { id-pe 1 }
-
-AuthorityInfoAccessSyntax  ::=
-        SEQUENCE SIZE (1..MAX) OF AccessDescription
-
-AccessDescription  ::=  SEQUENCE {
-        accessMethod          OBJECT IDENTIFIER,
-        accessLocation        GeneralName  }
-
 -- CRL number extension OID and syntax
 
-id-ce-cRLNumber OBJECT IDENTIFIER ::= { id-ce 20 }
-
 CRLNumber ::= INTEGER (0..MAX)
 
--- issuing distribution point extension OID and syntax
-
-id-ce-issuingDistributionPoint OBJECT IDENTIFIER ::= { id-ce 28 }
-
-IssuingDistributionPoint ::= SEQUENCE {
-     distributionPoint       [0] DistributionPointName OPTIONAL,
-     onlyContainsUserCerts   [1] BOOLEAN DEFAULT FALSE,
-     onlyContainsCACerts     [2] BOOLEAN DEFAULT FALSE,
-     onlySomeReasons         [3] ReasonFlags OPTIONAL,
-     indirectCRL             [4] BOOLEAN DEFAULT FALSE }
-
-
-id-ce-deltaCRLIndicator OBJECT IDENTIFIER ::= { id-ce 27 }
-
--- deltaCRLIndicator ::= BaseCRLNumber
-
-BaseCRLNumber ::= CRLNumber
-
--- CRL reasons extension OID and syntax
-
-id-ce-cRLReasons OBJECT IDENTIFIER ::= { id-ce 21 }
-
-CRLReason ::= ENUMERATED {
-     unspecified             (0),
-     keyCompromise           (1),
-     cACompromise            (2),
-     affiliationChanged      (3),
-     superseded              (4),
-     cessationOfOperation    (5),
-     certificateHold         (6),
-     removeFromCRL           (8) }
-
 -- certificate issuer CRL entry extension OID and syntax
 
-id-ce-certificateIssuer OBJECT IDENTIFIER ::= { id-ce 29 }
-
 CertificateIssuer ::= GeneralNames
 
--- hold instruction extension OID and syntax
-
-id-ce-holdInstructionCode OBJECT IDENTIFIER ::= { id-ce 23 }
-
-HoldInstructionCode ::= OBJECT IDENTIFIER
-
--- ANSI x9 holdinstructions
-
--- ANSI x9 arc holdinstruction arc
-holdInstruction OBJECT IDENTIFIER ::=
-          {joint-iso-itu-t(2) member-body(2) us(840) x9cm(10040) 2}
-
--- ANSI X9 holdinstructions referenced by this standard
-id-holdinstruction-none OBJECT IDENTIFIER  ::=
-                {holdInstruction 1} -- deprecated
-id-holdinstruction-callissuer OBJECT IDENTIFIER ::=
-                {holdInstruction 2}
-id-holdinstruction-reject OBJECT IDENTIFIER ::=
-                {holdInstruction 3}
-
--- invalidity date CRL entry extension OID and syntax
-
-id-ce-invalidityDate OBJECT IDENTIFIER ::= { id-ce 24 }
-
-InvalidityDate ::=  GeneralizedTime
-
-
 -- --------------------------------------
 --  EXPLICIT
 -- --------------------------------------
@@ -329,8 +112,6 @@ InvalidityDate ::=  GeneralizedTime
 -- UNIVERSAL Types defined in '93 and '98 ASN.1
 -- but required by this specification
 
-VisibleString ::= [UNIVERSAL 26] IMPLICIT OCTET STRING
-
 NumericString ::= [UNIVERSAL 18] IMPLICIT OCTET STRING
 
 IA5String ::= [UNIVERSAL 22] IMPLICIT OCTET STRING
@@ -350,35 +131,6 @@ UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
         -- The content of this type conforms to RFC 2279.
 
 
--- PKIX specific OIDs
-
-id-pkix  OBJECT IDENTIFIER  ::=
-         { iso(1) identified-organization(3) dod(6) internet(1)
-                    security(5) mechanisms(5) pkix(7) }
-
--- PKIX arcs
-
-id-pe OBJECT IDENTIFIER  ::=  { id-pkix 1 }
-        -- arc for private certificate extensions
-id-qt OBJECT IDENTIFIER ::= { id-pkix 2 }
-        -- arc for policy qualifier types
-id-kp OBJECT IDENTIFIER ::= { id-pkix 3 }
-        -- arc for extended key purpose OIDS
-id-ad OBJECT IDENTIFIER ::= { id-pkix 48 }
-        -- arc for access descriptors
-
--- policyQualifierIds for Internet policy qualifiers
-
-id-qt-cps      OBJECT IDENTIFIER ::=  { id-qt 1 }
-        -- OID for CPS qualifier
-id-qt-unotice  OBJECT IDENTIFIER ::=  { id-qt 2 }
-        -- OID for user notice qualifier
-
--- access descriptor definitions
-
-id-ad-ocsp      OBJECT IDENTIFIER ::= { id-ad 1 }
-id-ad-caIssuers OBJECT IDENTIFIER ::= { id-ad 2 }
-
 -- attribute data types --
 
 Attribute       ::=     SEQUENCE {
@@ -402,87 +154,29 @@ AttributeTypeAndValue           ::=     SEQUENCE {
 --  presented in pairs: the AttributeType followed by the
 --  type definition for the corresponding AttributeValue
 
--- Arc for standard naming attributes
-id-at           OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 4}
-
--- Attributes of type NameDirectoryString
-id-at-initials          AttributeType ::= { id-at 43 }
 X520initials ::= DirectoryString
-
-id-at-generationQualifier AttributeType ::= { id-at 44 }
 X520generationQualifier ::= DirectoryString
-
-id-at-surname           AttributeType ::= { id-at 4 }
 X520surName ::= DirectoryString
-
-id-at-givenName         AttributeType ::= { id-at 42 }
 X520givenName ::= DirectoryString
-
-id-at-name              AttributeType ::= { id-at 41 }
 X520name        ::= DirectoryString
-
-id-at-commonName        AttributeType   ::=     {id-at 3}
 X520CommonName  ::=      DirectoryString
-
-id-at-localityName      AttributeType   ::=     {id-at 7}
 X520LocalityName ::= DirectoryString
-
-id-at-stateOrProvinceName       AttributeType   ::=     {id-at 8}
 X520StateOrProvinceName         ::= DirectoryString
-
-id-at-organizationName          AttributeType   ::=     {id-at 10}
 X520OrganizationName ::= DirectoryString
-
-id-at-organizationalUnitName    AttributeType   ::=     {id-at 11}
 X520OrganizationalUnitName ::= DirectoryString
-
-id-at-title     AttributeType   ::=     {id-at 12}
 X520Title ::=   DirectoryString
-
-id-at-description     AttributeType   ::=     {id-at 13}
 X520Description ::=   DirectoryString
-
-id-at-dnQualifier       AttributeType   ::=     {id-at 46}
 X520dnQualifier ::=     PrintableString
-
-id-at-countryName       AttributeType   ::=     {id-at 6}
 X520countryName ::=     PrintableString (SIZE (2)) -- IS 3166 codes
-
-id-at-serialNumber       AttributeType   ::=     {id-at 5}
 X520serialNumber ::=     PrintableString
-
-id-at-telephoneNumber       AttributeType   ::=     {id-at 20}
 X520telephoneNumber ::=     PrintableString
-
-id-at-facsimileTelephoneNumber       AttributeType   ::=     {id-at 23}
 X520facsimileTelephoneNumber ::=     PrintableString
-
-id-at-pseudonym 	AttributeType   ::=     {id-at 65}
 X520pseudonym ::=	DirectoryString
-
-id-at-name 	AttributeType   ::=     {id-at 41}
 X520name ::=	DirectoryString
-
-id-at-streetAddress 	AttributeType   ::=     {id-at 9}
 X520streetAddress ::=	DirectoryString
 
-id-at-postalAddress	AttributeType	::=	{id-at 16}
-X520postalAddress ::= PostalAddress
-
-PostalAddress ::= SEQUENCE OF DirectoryString
-
-
  -- Legacy attributes
 
-pkcs OBJECT IDENTIFIER ::=
-       { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) }
-
-pkcs-9 OBJECT IDENTIFIER ::=
-       { pkcs 9 }
-
-
-emailAddress AttributeType      ::= { pkcs-9 1 }
-
 Pkcs9email ::= IA5String (SIZE (1..ub-emailaddress-length))
 
 -- naming data types --
@@ -588,28 +282,11 @@ AlgorithmIdentifier  ::=  SEQUENCE  {
 
 -- Algorithm OIDs and parameter structures
 
-pkcs-1 OBJECT IDENTIFIER ::= {
-     pkcs 1 }
-
-rsaEncryption OBJECT IDENTIFIER ::=  { pkcs-1 1 }
-
-md2WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 2 }
-
-md5WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 4 }
-
-sha1WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 5 }
-
-id-dsa-with-sha1 OBJECT IDENTIFIER ::=  {
-     iso(1) member-body(2) us(840) x9-57 (10040) x9algorithm(4) 3 }
-
 Dss-Sig-Value ::= SEQUENCE {
      r       INTEGER,
      s       INTEGER  
 }
 
-dhpublicnumber OBJECT IDENTIFIER ::= {
-     iso(1) member-body(2) us(840) ansi-x942(10046) number-type(2) 1 }
-
 DomainParameters ::= SEQUENCE {
      p       INTEGER, -- odd prime, p=jq +1
      g       INTEGER, -- generator, g
@@ -621,9 +298,6 @@ ValidationParms ::= SEQUENCE {
      seed             BIT STRING,
      pgenCounter      INTEGER }
 
-id-dsa OBJECT IDENTIFIER ::= {
-     iso(1) member-body(2) us(840) x9-57(10040) x9algorithm(4) 1 }
-
 Dss-Parms  ::=  SEQUENCE  {
      p             INTEGER,
      q             INTEGER,
@@ -632,55 +306,12 @@ Dss-Parms  ::=  SEQUENCE  {
 -- x400 address syntax starts here
 --      OR Names
 
-ORAddress ::= SEQUENCE {
-   built-in-standard-attributes BuiltInStandardAttributes,
-   built-in-domain-defined-attributes
-                        BuiltInDomainDefinedAttributes OPTIONAL,
-   -- see also teletex-domain-defined-attributes
-   extension-attributes ExtensionAttributes OPTIONAL }
---      The OR-address is semantically absent from the OR-name if the
---      built-in-standard-attribute sequence is empty and the
---      built-in-domain-defined-attributes and extension-attributes are
---      both omitted.
-
---      Built-in Standard Attributes
-
-BuiltInStandardAttributes ::= SEQUENCE {
-   country-name CountryName OPTIONAL,
-   administration-domain-name AdministrationDomainName OPTIONAL,
-   network-address      [0] EXPLICIT NetworkAddress OPTIONAL,
-   -- see also extended-network-address
-   terminal-identifier  [1] EXPLICIT TerminalIdentifier OPTIONAL,
-   private-domain-name  [2] EXPLICIT PrivateDomainName OPTIONAL,
-   organization-name    [3] EXPLICIT OrganizationName OPTIONAL,
-   -- see also teletex-organization-name
-   numeric-user-identifier      [4] EXPLICIT NumericUserIdentifier OPTIONAL,
-   personal-name        [5] EXPLICIT PersonalName OPTIONAL,
-   -- see also teletex-personal-name
-   organizational-unit-names    [6] EXPLICIT OrganizationalUnitNames OPTIONAL
-   -- see also teletex-organizational-unit-names -- 
-}
-
 CountryName ::= [APPLICATION 1] CHOICE {
    x121-dcc-code NumericString
                 (SIZE (ub-country-name-numeric-length)),
    iso-3166-alpha2-code PrintableString
                 (SIZE (ub-country-name-alpha-length)) }
 
-AdministrationDomainName ::= [APPLICATION 2] EXPLICIT CHOICE {
-   numeric NumericString (SIZE (0..ub-domain-name-length)),
-   printable PrintableString (SIZE (0..ub-domain-name-length)) }
-
-NetworkAddress ::= X121Address  -- see also extended-network-address
-
-X121Address ::= NumericString (SIZE (1..ub-x121-address-length))
-
-TerminalIdentifier ::= PrintableString (SIZE (1..ub-terminal-id-length))
-
-PrivateDomainName ::= CHOICE {
-   numeric NumericString (SIZE (1..ub-domain-name-length)),
-   printable PrintableString (SIZE (1..ub-domain-name-length)) }
-
 OrganizationName ::= PrintableString
                             (SIZE (1..ub-organization-name-length))
 -- see also teletex-organization-name
@@ -688,13 +319,6 @@ OrganizationName ::= PrintableString
 NumericUserIdentifier ::= NumericString
                             (SIZE (1..ub-numeric-user-id-length))
 
-PersonalName ::= SET {
-   surname [0] PrintableString (SIZE (1..ub-surname-length)),
-   given-name [1] PrintableString
-                        (SIZE (1..ub-given-name-length)) OPTIONAL,
-   initials [2] PrintableString (SIZE (1..ub-initials-length)) OPTIONAL,
-   generation-qualifier [3] PrintableString
-                (SIZE (1..ub-generation-qualifier-length)) OPTIONAL }
 -- see also teletex-personal-name
 
 OrganizationalUnitNames ::= SEQUENCE SIZE (1..ub-organizational-units)
@@ -704,227 +328,10 @@ OrganizationalUnitNames ::= SEQUENCE SIZE (1..ub-organizational-units)
 OrganizationalUnitName ::= PrintableString (SIZE
                         (1..ub-organizational-unit-name-length))
 
---      Built-in Domain-defined Attributes
-
-BuiltInDomainDefinedAttributes ::= SEQUENCE SIZE
-                                (1..ub-domain-defined-attributes) OF
-                                BuiltInDomainDefinedAttribute
-
-BuiltInDomainDefinedAttribute ::= SEQUENCE {
-   type PrintableString (SIZE
-                        (1..ub-domain-defined-attribute-type-length)),
-   value PrintableString (SIZE
-                        (1..ub-domain-defined-attribute-value-length))}
-
---      Extension Attributes
-
-ExtensionAttributes ::= SET SIZE (1..ub-extension-attributes) OF
-                        ExtensionAttribute
-
-ExtensionAttribute ::=  SEQUENCE {
-   extension-attribute-type [0] EXPLICIT INTEGER (0..ub-extension-attributes),
-   extension-attribute-value [1] EXPLICIT
-                        ANY DEFINED BY extension-attribute-type }
-
 -- Extension types and attribute values
 --
 
-common-name INTEGER ::= 1
-
-CommonName ::= PrintableString (SIZE (1..ub-common-name-length))
-
-teletex-common-name INTEGER ::= 2
-
-TeletexCommonName ::= TeletexString (SIZE (1..ub-common-name-length))
-
-teletex-organization-name INTEGER ::= 3
-
-TeletexOrganizationName ::=
-                TeletexString (SIZE (1..ub-organization-name-length))
-
-teletex-personal-name INTEGER ::= 4
-
-TeletexPersonalName ::= SET {
-   surname [0] EXPLICIT TeletexString (SIZE (1..ub-surname-length)),
-   given-name [1] EXPLICIT TeletexString
-                (SIZE (1..ub-given-name-length)) OPTIONAL,
-   initials [2] EXPLICIT TeletexString (SIZE (1..ub-initials-length)) OPTIONAL,
-   generation-qualifier [3] EXPLICIT TeletexString (SIZE
-                (1..ub-generation-qualifier-length)) OPTIONAL }
-
-teletex-organizational-unit-names INTEGER ::= 5
-
-TeletexOrganizationalUnitNames ::= SEQUENCE SIZE
-        (1..ub-organizational-units) OF TeletexOrganizationalUnitName
-
-TeletexOrganizationalUnitName ::= TeletexString
-                        (SIZE (1..ub-organizational-unit-name-length))
-
-pds-name INTEGER ::= 7
-
-PDSName ::= PrintableString (SIZE (1..ub-pds-name-length))
-
-physical-delivery-country-name INTEGER ::= 8
-
-PhysicalDeliveryCountryName ::= CHOICE {
-   x121-dcc-code NumericString (SIZE (ub-country-name-numeric-length)),
-   iso-3166-alpha2-code PrintableString
-                        (SIZE (ub-country-name-alpha-length)) }
-
-postal-code INTEGER ::= 9
-
-PostalCode ::= CHOICE {
-   numeric-code NumericString (SIZE (1..ub-postal-code-length)),
-   printable-code PrintableString (SIZE (1..ub-postal-code-length)) }
-
-physical-delivery-office-name INTEGER ::= 10
-
-PhysicalDeliveryOfficeName ::= PDSParameter
-
-physical-delivery-office-number INTEGER ::= 11
-
-PhysicalDeliveryOfficeNumber ::= PDSParameter
-
-extension-OR-address-components INTEGER ::= 12
-
-ExtensionORAddressComponents ::= PDSParameter
-
-physical-delivery-personal-name INTEGER ::= 13
-
-PhysicalDeliveryPersonalName ::= PDSParameter
-
-physical-delivery-organization-name INTEGER ::= 14
-
-PhysicalDeliveryOrganizationName ::= PDSParameter
-
-extension-physical-delivery-address-components INTEGER ::= 15
-
-ExtensionPhysicalDeliveryAddressComponents ::= PDSParameter
-
-unformatted-postal-address INTEGER ::= 16
-
-UnformattedPostalAddress ::= SET {
-   printable-address SEQUENCE SIZE (1..ub-pds-physical-address-lines) OF
-           PrintableString (SIZE (1..ub-pds-parameter-length)) OPTIONAL,
-   teletex-string TeletexString
-         (SIZE (1..ub-unformatted-address-length)) OPTIONAL }
-
-street-address INTEGER ::= 17
-
-StreetAddress ::= PDSParameter
-
-post-office-box-address INTEGER ::= 18
-
-PostOfficeBoxAddress ::= PDSParameter
-
-poste-restante-address INTEGER ::= 19
-
-PosteRestanteAddress ::= PDSParameter
-
-unique-postal-name INTEGER ::= 20
-
-UniquePostalName ::= PDSParameter
-
-local-postal-attributes INTEGER ::= 21
-
-LocalPostalAttributes ::= PDSParameter
-
-PDSParameter ::= SET {
-   printable-string PrintableString
-                (SIZE(1..ub-pds-parameter-length)) OPTIONAL,
-   teletex-string TeletexString
-                (SIZE(1..ub-pds-parameter-length)) OPTIONAL }
-
-extended-network-address INTEGER ::= 22
-
-ExtendedNetworkAddress ::= CHOICE {
-   e163-4-address SEQUENCE {
-        number [0] EXPLICIT NumericString (SIZE (1..ub-e163-4-number-length)),
-        sub-address [1] EXPLICIT NumericString
-                (SIZE (1..ub-e163-4-sub-address-length)) OPTIONAL },
-   psap-address [0] EXPLICIT PresentationAddress }
-
-PresentationAddress ::= SEQUENCE {
-        pSelector       [0] EXPLICIT OCTET STRING OPTIONAL,
-        sSelector       [1] EXPLICIT OCTET STRING OPTIONAL,
-        tSelector       [2] EXPLICIT OCTET STRING OPTIONAL,
-        nAddresses      [3] EXPLICIT SET SIZE (1..MAX) OF OCTET STRING }
-
-terminal-type  INTEGER ::= 23
-
-TerminalType ::= INTEGER {
-   telex (3),
-   teletex (4),
-   g3-facsimile (5),
-   g4-facsimile (6),
-   ia5-terminal (7),
-   videotex (8) } -- (0..ub-integer-options)
-
---      Extension Domain-defined Attributes
-
-teletex-domain-defined-attributes INTEGER ::= 6
-
-TeletexDomainDefinedAttributes ::= SEQUENCE SIZE
-   (1..ub-domain-defined-attributes) OF TeletexDomainDefinedAttribute
-
-TeletexDomainDefinedAttribute ::= SEQUENCE {
-        type TeletexString
-               (SIZE (1..ub-domain-defined-attribute-type-length)),
-        value TeletexString
-               (SIZE (1..ub-domain-defined-attribute-value-length)) }
-
---  specifications of Upper Bounds shall be regarded as mandatory
---  from Annex B of ITU-T X.411 Reference Definition of MTS Parameter
---  Upper Bounds
-
---      Upper Bounds
-ub-name INTEGER ::=     32768
-ub-common-name  INTEGER ::=     64
-ub-locality-name        INTEGER ::=     128
-ub-state-name   INTEGER ::=     128
-ub-organization-name    INTEGER ::=     64
-ub-organizational-unit-name     INTEGER ::=     64
-ub-title        INTEGER ::=     64
-ub-match        INTEGER ::=     128
-
-ub-emailaddress-length INTEGER ::= 128
-
-ub-common-name-length INTEGER ::= 64
-ub-country-name-alpha-length INTEGER ::= 2
-ub-country-name-numeric-length INTEGER ::= 3
-ub-domain-defined-attributes INTEGER ::= 4
-ub-domain-defined-attribute-type-length INTEGER ::= 8
-ub-domain-defined-attribute-value-length INTEGER ::= 128
-ub-domain-name-length INTEGER ::= 16
-ub-extension-attributes INTEGER ::= 256
-ub-e163-4-number-length INTEGER ::= 15
-ub-e163-4-sub-address-length INTEGER ::= 40
-ub-generation-qualifier-length INTEGER ::= 3
-ub-given-name-length INTEGER ::= 16
-ub-initials-length INTEGER ::= 5
-ub-integer-options INTEGER ::= 256
-ub-numeric-user-id-length INTEGER ::= 32
-ub-organization-name-length INTEGER ::= 64
-ub-organizational-unit-name-length INTEGER ::= 32
-ub-organizational-units INTEGER ::= 4
-ub-pds-name-length INTEGER ::= 16
-ub-pds-parameter-length INTEGER ::= 30
-ub-pds-physical-address-lines INTEGER ::= 6
-ub-postal-code-length INTEGER ::= 16
-ub-surname-length INTEGER ::= 40
-ub-terminal-id-length INTEGER ::= 24
-ub-unformatted-address-length INTEGER ::= 180
-ub-x121-address-length INTEGER ::= 16
-
--- Note - upper bounds on string types, such as TeletexString, are
--- measured in characters.  Excepting PrintableString or IA5String, a
--- significantly greater number of octets will be required to hold
--- such a value.  As a minimum, 16 octets, or twice the specified upper
--- bound, whichever is the larger, should be allowed for TeletexString.
--- For UTF8String or UniversalString at least four times the upper
--- bound should be allowed.
-
-
+CommonName ::= PrintableString
 
 -- END of PKIX1Implicit88
 
@@ -1004,21 +411,12 @@ pkcs-10-CertificationRequest ::= SEQUENCE {
 
 pkcs-9-ub-challengePassword   INTEGER ::= 255
 
-pkcs-9-certTypes OBJECT IDENTIFIER ::= {pkcs-9 22}
-pkcs-9-crlTypes OBJECT IDENTIFIER ::= {pkcs-9 23}
-
-pkcs-9-at-challengePassword OBJECT IDENTIFIER   ::= {pkcs-9 7}
-
 pkcs-9-challengePassword        ::= CHOICE {
       printableString       PrintableString (SIZE (1..pkcs-9-ub-challengePassword)),
       utf8String            UTF8String (SIZE (1..pkcs-9-ub-challengePassword)) }
 
-pkcs-9-at-localKeyId               OBJECT IDENTIFIER ::= {pkcs-9 21}
-
 pkcs-9-localKeyId ::= OCTET STRING
 
-pkcs-9-at-friendlyName             OBJECT IDENTIFIER ::= {pkcs-9 20}
-
 pkcs-9-friendlyName ::= BMPString      (SIZE (1..255))
 
 -- PKCS #8 stuff
@@ -1048,28 +446,14 @@ pkcs-8-EncryptedData ::= OCTET STRING
 
 -- PKCS #5 stuff
 
-pkcs-5 OBJECT IDENTIFIER ::=
-       { pkcs 5 }
-
-pkcs-5-encryptionAlgorithm OBJECT IDENTIFIER ::=
-       { iso(1) member-body(2) us(840) rsadsi(113549) 3 }
-
-pkcs-5-des-EDE3-CBC OBJECT IDENTIFIER ::= {pkcs-5-encryptionAlgorithm 7}
-
 pkcs-5-des-EDE3-CBC-params ::= OCTET STRING (SIZE(8))
 
-pkcs-5-id-PBES2 OBJECT IDENTIFIER ::= {pkcs-5 13}
-
 pkcs-5-PBES2-params ::= SEQUENCE {
   keyDerivationFunc AlgorithmIdentifier,
   encryptionScheme AlgorithmIdentifier }
 
 -- PBKDF2
 
-pkcs-5-id-PBKDF2 OBJECT IDENTIFIER ::= {pkcs-5 12}
-
--- pkcs-5-id-hmacWithSHA1 OBJECT IDENTIFIER ::= {iso(1) member-body(2) us(840) rsadsi(113549) 2 7}
-
 -- pkcs-5-algid-hmacWithSHA1 AlgorithmIdentifier ::=
 --   {algorithm pkcs-5-id-hmacWithSHA1, parameters NULL : NULL}
 
@@ -1085,8 +469,6 @@ pkcs-5-PBKDF2-params ::= SEQUENCE {
 
 -- PKCS #12 stuff
 
-pkcs-12	OBJECT IDENTIFIER ::= {pkcs 12}
-
 pkcs-12-PFX ::= SEQUENCE {
     	version		INTEGER {v3(3)},
     	authSafe	pkcs-7-ContentInfo,
@@ -1121,14 +503,6 @@ pkcs-12-SafeBag ::= SEQUENCE {
 
 -- Bag types
 
-
-pkcs-12-bagtypes OBJECT IDENTIFIER ::= {pkcs-12 10 1}
-
-pkcs-12-keyBag OBJECT IDENTIFIER ::= {pkcs-12-bagtypes 1}
-pkcs-12-pkcs8ShroudedKeyBag OBJECT IDENTIFIER ::= {pkcs-12-bagtypes 2}
-pkcs-12-certBag OBJECT IDENTIFIER ::= {pkcs-12-bagtypes 3}
-pkcs-12-crlBag OBJECT IDENTIFIER ::= {pkcs-12-bagtypes 4}
-
 pkcs-12-KeyBag ::= pkcs-8-PrivateKeyInfo
 
 -- Shrouded KeyBag
@@ -1158,12 +532,6 @@ pkcs-12-PKCS12Attribute ::= Attribute
 
 -- PKCS #7 stuff (needed in PKCS 12)
 
-pkcs-7-data OBJECT IDENTIFIER ::= { iso(1) member-body(2)
-    us(840) rsadsi(113549) pkcs(1) pkcs7(7) 1 }
-
-pkcs-7-encryptedData OBJECT IDENTIFIER ::= { iso(1) member-body(2)
-    us(840) rsadsi(113549) pkcs(1) pkcs7(7) 6 }
-
 pkcs-7-Data ::= OCTET STRING
 
 pkcs-7-EncryptedData ::= SEQUENCE {
@@ -1183,45 +551,22 @@ pkcs-7-EncryptedContent ::= OCTET STRING
 pkcs-7-UnprotectedAttributes ::= SET SIZE (1..MAX) OF Attribute
 
 -- LDAP stuff
--- may not be correct
-
-id-at-ldap-DC AttributeType ::= { 0 9 2342 19200300 100 1 25 }
 
 ldap-DC ::= IA5String
-
-id-at-ldap-UID AttributeType ::= { 0 9 2342 19200300 100 1 1 }
-
 ldap-UID ::= DirectoryString
 
 -- rfc3039
 
-id-pda  OBJECT IDENTIFIER ::= { id-pkix 9 }
-
-id-pda-dateOfBirth          AttributeType ::= { id-pda 1 }
 DateOfBirth ::=             GeneralizedTime
-
-id-pda-placeOfBirth         AttributeType ::= { id-pda 2 }
 PlaceOfBirth ::=            DirectoryString
-
-id-pda-gender               AttributeType ::= { id-pda 3 }
 Gender ::=                  PrintableString (SIZE(1))
-                            -- "M", "F", "m" or "f"
-
-id-pda-countryOfCitizenship AttributeType ::= { id-pda 4 }
 CountryOfCitizenship ::=    PrintableString (SIZE (2))
                             -- ISO 3166 Country Code
-
-id-pda-countryOfResidence   AttributeType ::= { id-pda 5 }
 CountryOfResidence ::=      PrintableString (SIZE (2))
                             -- ISO 3166 Country Code
 
 -- rfc3820
 
-id-pe-proxyCertInfo OBJECT IDENTIFIER ::= { id-pe 14 }
-
-id-ppl-inheritAll OBJECT IDENTIFIER ::= { id-pkix 21 1 }
-id-ppl-independent OBJECT IDENTIFIER ::= { id-pkix 21 2 }
-
 ProxyCertInfo ::= SEQUENCE {
 	pCPathLenConstraint	INTEGER (0..MAX) OPTIONAL,
 	proxyPolicy		ProxyPolicy }
@@ -1232,10 +577,6 @@ ProxyPolicy ::= SEQUENCE {
 
 -- rfc3920 section 5.1.1
 
-id-on  OBJECT IDENTIFIER ::= { id-pkix 8 }  -- other name forms
-
-id-on-xmppAddr  OBJECT IDENTIFIER ::= { id-on 5 }
-
 XmppAddr ::= UTF8String
 
 END
diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c
index 4edade6d43..16d0eeed37 100644
--- a/lib/pkix_asn1_tab.c
+++ b/lib/pkix_asn1_tab.c
@@ -1,4 +1,4 @@
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include "config.h"
 #endif
 
@@ -7,13 +7,6 @@
 const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "PKIX1", 536875024, NULL },
   { NULL, 1073741836, NULL },
-  { "id-ce", 1879048204, NULL },
-  { "joint-iso-ccitt", 1073741825, "2"},
-  { "ds", 1073741825, "5"},
-  { NULL, 1, "29"},
-  { "id-ce-authorityKeyIdentifier", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "35"},
   { "AuthorityKeyIdentifier", 1610612741, NULL },
   { "keyIdentifier", 1610637314, "KeyIdentifier"},
   { NULL, 4104, "0"},
@@ -22,71 +15,8 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "authorityCertSerialNumber", 536895490, "CertificateSerialNumber"},
   { NULL, 4104, "2"},
   { "KeyIdentifier", 1073741831, NULL },
-  { "id-ce-subjectKeyIdentifier", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "14"},
   { "SubjectKeyIdentifier", 1073741826, "KeyIdentifier"},
-  { "id-ce-keyUsage", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "15"},
-  { "KeyUsage", 1610874886, NULL },
-  { "digitalSignature", 1073741825, "0"},
-  { "nonRepudiation", 1073741825, "1"},
-  { "keyEncipherment", 1073741825, "2"},
-  { "dataEncipherment", 1073741825, "3"},
-  { "keyAgreement", 1073741825, "4"},
-  { "keyCertSign", 1073741825, "5"},
-  { "cRLSign", 1073741825, "6"},
-  { "encipherOnly", 1073741825, "7"},
-  { "decipherOnly", 1, "8"},
-  { "id-ce-privateKeyUsagePeriod", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "16"},
-  { "PrivateKeyUsagePeriod", 1610612741, NULL },
-  { "notBefore", 1619025937, NULL },
-  { NULL, 4104, "0"},
-  { "notAfter", 545284113, NULL },
-  { NULL, 4104, "1"},
-  { "id-ce-certificatePolicies", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "32"},
-  { "CertificatePolicies", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "PolicyInformation"},
-  { "PolicyInformation", 1610612741, NULL },
-  { "policyIdentifier", 1073741826, "CertPolicyId"},
-  { "policyQualifiers", 538984459, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "PolicyQualifierInfo"},
-  { "CertPolicyId", 1073741836, NULL },
-  { "PolicyQualifierInfo", 1610612741, NULL },
-  { "policyQualifierId", 1073741826, "PolicyQualifierId"},
-  { "qualifier", 541065229, NULL },
-  { "policyQualifierId", 1, NULL },
-  { "PolicyQualifierId", 1073741836, NULL },
-  { "CPSuri", 1073741826, "IA5String"},
-  { "UserNotice", 1610612741, NULL },
-  { "noticeRef", 1073758210, "NoticeReference"},
-  { "explicitText", 16386, "DisplayText"},
-  { "NoticeReference", 1610612741, NULL },
-  { "organization", 1073741826, "DisplayText"},
-  { "noticeNumbers", 536870923, NULL },
-  { NULL, 3, NULL },
-  { "DisplayText", 1610612754, NULL },
-  { "visibleString", 1612709890, "VisibleString"},
-  { "200", 524298, "1"},
-  { "bmpString", 1612709890, "BMPString"},
-  { "200", 524298, "1"},
-  { "utf8String", 538968066, "UTF8String"},
-  { "200", 524298, "1"},
-  { "id-ce-policyMappings", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "33"},
-  { "PolicyMappings", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 536870917, NULL },
-  { "issuerDomainPolicy", 1073741826, "CertPolicyId"},
-  { "subjectDomainPolicy", 2, "CertPolicyId"},
+  { "KeyUsage", 1073741830, NULL },
   { "DirectoryString", 1610612754, NULL },
   { "teletexString", 1612709890, "TeletexString"},
   { "MAX", 524298, "1"},
@@ -100,9 +30,6 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "MAX", 524298, "1"},
   { "ia5String", 538968066, "IA5String"},
   { "MAX", 524298, "1"},
-  { "id-ce-subjectAltName", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "17"},
   { "SubjectAltName", 1073741826, "GeneralNames"},
   { "GeneralNames", 1612709899, NULL },
   { "MAX", 1074266122, "1"},
@@ -114,11 +41,11 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { NULL, 4104, "1"},
   { "dNSName", 1610620930, "IA5String"},
   { NULL, 4104, "2"},
-  { "x400Address", 1610620930, "ORAddress"},
+  { "x400Address", 1610620941, NULL },
   { NULL, 4104, "3"},
   { "directoryName", 1610620930, "RDNSequence"},
   { NULL, 2056, "4"},
-  { "ediPartyName", 1610620930, "EDIPartyName"},
+  { "ediPartyName", 1610620941, NULL },
   { NULL, 4104, "5"},
   { "uniformResourceIdentifier", 1610620930, "IA5String"},
   { NULL, 4104, "6"},
@@ -131,62 +58,12 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "value", 541073421, NULL },
   { NULL, 1073743880, "0"},
   { "type-id", 1, NULL },
-  { "EDIPartyName", 1610612741, NULL },
-  { "nameAssigner", 1610637314, "DirectoryString"},
-  { NULL, 4104, "0"},
-  { "partyName", 536879106, "DirectoryString"},
-  { NULL, 4104, "1"},
-  { "id-ce-issuerAltName", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "18"},
   { "IssuerAltName", 1073741826, "GeneralNames"},
-  { "id-ce-subjectDirectoryAttributes", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "9"},
-  { "SubjectDirectoryAttributes", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "Attribute"},
-  { "id-ce-basicConstraints", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "19"},
   { "BasicConstraints", 1610612741, NULL },
   { "cA", 1610645508, NULL },
   { NULL, 131081, NULL },
   { "pathLenConstraint", 537411587, NULL },
   { "0", 10, "MAX"},
-  { "id-ce-nameConstraints", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "30"},
-  { "NameConstraints", 1610612741, NULL },
-  { "permittedSubtrees", 1610637314, "GeneralSubtrees"},
-  { NULL, 4104, "0"},
-  { "excludedSubtrees", 536895490, "GeneralSubtrees"},
-  { NULL, 4104, "1"},
-  { "GeneralSubtrees", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "GeneralSubtree"},
-  { "GeneralSubtree", 1610612741, NULL },
-  { "base", 1073741826, "GeneralName"},
-  { "minimum", 1610653698, "BaseDistance"},
-  { NULL, 1073741833, "0"},
-  { NULL, 4104, "0"},
-  { "maximum", 536895490, "BaseDistance"},
-  { NULL, 4104, "1"},
-  { "BaseDistance", 1611137027, NULL },
-  { "0", 10, "MAX"},
-  { "id-ce-policyConstraints", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "36"},
-  { "PolicyConstraints", 1610612741, NULL },
-  { "requireExplicitPolicy", 1610637314, "SkipCerts"},
-  { NULL, 4104, "0"},
-  { "inhibitPolicyMapping", 536895490, "SkipCerts"},
-  { NULL, 4104, "1"},
-  { "SkipCerts", 1611137027, NULL },
-  { "0", 10, "MAX"},
-  { "id-ce-cRLDistributionPoints", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "31"},
   { "CRLDistributionPoints", 1612709899, NULL },
   { "MAX", 1074266122, "1"},
   { NULL, 2, "DistributionPoint"},
@@ -202,123 +79,14 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { NULL, 4104, "0"},
   { "nameRelativeToCRLIssuer", 536879106, "RelativeDistinguishedName"},
   { NULL, 4104, "1"},
-  { "ReasonFlags", 1610874886, NULL },
-  { "unused", 1073741825, "0"},
-  { "keyCompromise", 1073741825, "1"},
-  { "cACompromise", 1073741825, "2"},
-  { "affiliationChanged", 1073741825, "3"},
-  { "superseded", 1073741825, "4"},
-  { "cessationOfOperation", 1073741825, "5"},
-  { "certificateHold", 1073741825, "6"},
-  { "privilegeWithdrawn", 1073741825, "7"},
-  { "aACompromise", 1, "8"},
-  { "id-ce-extKeyUsage", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "37"},
+  { "ReasonFlags", 1073741830, NULL },
   { "ExtKeyUsageSyntax", 1612709899, NULL },
   { "MAX", 1074266122, "1"},
   { NULL, 2, "KeyPurposeId"},
   { "KeyPurposeId", 1073741836, NULL },
-  { "id-kp-serverAuth", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "1"},
-  { "id-kp-clientAuth", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "2"},
-  { "id-kp-codeSigning", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "3"},
-  { "id-kp-emailProtection", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "4"},
-  { "id-kp-ipsecEndSystem", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "5"},
-  { "id-kp-ipsecTunnel", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "6"},
-  { "id-kp-ipsecUser", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "7"},
-  { "id-kp-timeStamping", 1879048204, NULL },
-  { NULL, 1073741825, "id-kp"},
-  { NULL, 1, "8"},
-  { "id-pe-authorityInfoAccess", 1879048204, NULL },
-  { NULL, 1073741825, "id-pe"},
-  { NULL, 1, "1"},
-  { "AuthorityInfoAccessSyntax", 1612709899, NULL },
-  { "MAX", 1074266122, "1"},
-  { NULL, 2, "AccessDescription"},
-  { "AccessDescription", 1610612741, NULL },
-  { "accessMethod", 1073741836, NULL },
-  { "accessLocation", 2, "GeneralName"},
-  { "id-ce-cRLNumber", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "20"},
   { "CRLNumber", 1611137027, NULL },
   { "0", 10, "MAX"},
-  { "id-ce-issuingDistributionPoint", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "28"},
-  { "IssuingDistributionPoint", 1610612741, NULL },
-  { "distributionPoint", 1610637314, "DistributionPointName"},
-  { NULL, 4104, "0"},
-  { "onlyContainsUserCerts", 1610653700, NULL },
-  { NULL, 1073872905, NULL },
-  { NULL, 4104, "1"},
-  { "onlyContainsCACerts", 1610653700, NULL },
-  { NULL, 1073872905, NULL },
-  { NULL, 4104, "2"},
-  { "onlySomeReasons", 1610637314, "ReasonFlags"},
-  { NULL, 4104, "3"},
-  { "indirectCRL", 536911876, NULL },
-  { NULL, 1073872905, NULL },
-  { NULL, 4104, "4"},
-  { "id-ce-deltaCRLIndicator", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "27"},
-  { "BaseCRLNumber", 1073741826, "CRLNumber"},
-  { "id-ce-cRLReasons", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "21"},
-  { "CRLReason", 1610874901, NULL },
-  { "unspecified", 1073741825, "0"},
-  { "keyCompromise", 1073741825, "1"},
-  { "cACompromise", 1073741825, "2"},
-  { "affiliationChanged", 1073741825, "3"},
-  { "superseded", 1073741825, "4"},
-  { "cessationOfOperation", 1073741825, "5"},
-  { "certificateHold", 1073741825, "6"},
-  { "removeFromCRL", 1, "8"},
-  { "id-ce-certificateIssuer", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "29"},
   { "CertificateIssuer", 1073741826, "GeneralNames"},
-  { "id-ce-holdInstructionCode", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "23"},
-  { "HoldInstructionCode", 1073741836, NULL },
-  { "holdInstruction", 1879048204, NULL },
-  { "joint-iso-itu-t", 1073741825, "2"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "x9cm", 1073741825, "10040"},
-  { NULL, 1, "2"},
-  { "id-holdinstruction-none", 1879048204, NULL },
-  { NULL, 1073741825, "holdInstruction"},
-  { NULL, 1, "1"},
-  { "id-holdinstruction-callissuer", 1879048204, NULL },
-  { NULL, 1073741825, "holdInstruction"},
-  { NULL, 1, "2"},
-  { "id-holdinstruction-reject", 1879048204, NULL },
-  { NULL, 1073741825, "holdInstruction"},
-  { NULL, 1, "3"},
-  { "id-ce-invalidityDate", 1879048204, NULL },
-  { NULL, 1073741825, "id-ce"},
-  { NULL, 1, "24"},
-  { "InvalidityDate", 1082130449, NULL },
-  { "VisibleString", 1610620935, NULL },
-  { NULL, 4360, "26"},
   { "NumericString", 1610620935, NULL },
   { NULL, 4360, "18"},
   { "IA5String", 1610620935, NULL },
@@ -333,38 +101,6 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { NULL, 4360, "30"},
   { "UTF8String", 1610620935, NULL },
   { NULL, 4360, "12"},
-  { "id-pkix", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "identified-organization", 1073741825, "3"},
-  { "dod", 1073741825, "6"},
-  { "internet", 1073741825, "1"},
-  { "security", 1073741825, "5"},
-  { "mechanisms", 1073741825, "5"},
-  { "pkix", 1, "7"},
-  { "id-pe", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1, "1"},
-  { "id-qt", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1, "2"},
-  { "id-kp", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1, "3"},
-  { "id-ad", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1, "48"},
-  { "id-qt-cps", 1879048204, NULL },
-  { NULL, 1073741825, "id-qt"},
-  { NULL, 1, "1"},
-  { "id-qt-unotice", 1879048204, NULL },
-  { NULL, 1073741825, "id-qt"},
-  { NULL, 1, "2"},
-  { "id-ad-ocsp", 1879048204, NULL },
-  { NULL, 1073741825, "id-ad"},
-  { NULL, 1, "1"},
-  { "id-ad-caIssuers", 1879048204, NULL },
-  { NULL, 1073741825, "id-ad"},
-  { NULL, 1, "2"},
   { "Attribute", 1610612741, NULL },
   { "type", 1073741826, "AttributeType"},
   { "values", 536870927, NULL },
@@ -375,109 +111,27 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "AttributeTypeAndValue", 1610612741, NULL },
   { "type", 1073741826, "AttributeType"},
   { "value", 2, "AttributeValue"},
-  { "id-at", 1879048204, NULL },
-  { "joint-iso-ccitt", 1073741825, "2"},
-  { "ds", 1073741825, "5"},
-  { NULL, 1, "4"},
-  { "id-at-initials", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "43"},
   { "X520initials", 1073741826, "DirectoryString"},
-  { "id-at-generationQualifier", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "44"},
   { "X520generationQualifier", 1073741826, "DirectoryString"},
-  { "id-at-surname", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "4"},
   { "X520surName", 1073741826, "DirectoryString"},
-  { "id-at-givenName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "42"},
   { "X520givenName", 1073741826, "DirectoryString"},
-  { "id-at-name", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "41"},
   { "X520name", 1073741826, "DirectoryString"},
-  { "id-at-commonName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "3"},
   { "X520CommonName", 1073741826, "DirectoryString"},
-  { "id-at-localityName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "7"},
   { "X520LocalityName", 1073741826, "DirectoryString"},
-  { "id-at-stateOrProvinceName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "8"},
   { "X520StateOrProvinceName", 1073741826, "DirectoryString"},
-  { "id-at-organizationName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "10"},
   { "X520OrganizationName", 1073741826, "DirectoryString"},
-  { "id-at-organizationalUnitName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "11"},
   { "X520OrganizationalUnitName", 1073741826, "DirectoryString"},
-  { "id-at-title", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "12"},
   { "X520Title", 1073741826, "DirectoryString"},
-  { "id-at-description", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "13"},
   { "X520Description", 1073741826, "DirectoryString"},
-  { "id-at-dnQualifier", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "46"},
   { "X520dnQualifier", 1073741826, "PrintableString"},
-  { "id-at-countryName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "6"},
   { "X520countryName", 1612709890, "PrintableString"},
   { NULL, 1048586, "2"},
-  { "id-at-serialNumber", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "5"},
   { "X520serialNumber", 1073741826, "PrintableString"},
-  { "id-at-telephoneNumber", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "20"},
   { "X520telephoneNumber", 1073741826, "PrintableString"},
-  { "id-at-facsimileTelephoneNumber", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "23"},
   { "X520facsimileTelephoneNumber", 1073741826, "PrintableString"},
-  { "id-at-pseudonym", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "65"},
   { "X520pseudonym", 1073741826, "DirectoryString"},
-  { "id-at-name", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "41"},
   { "X520name", 1073741826, "DirectoryString"},
-  { "id-at-streetAddress", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "9"},
   { "X520streetAddress", 1073741826, "DirectoryString"},
-  { "id-at-postalAddress", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "16"},
-  { "X520postalAddress", 1073741826, "PostalAddress"},
-  { "PostalAddress", 1610612747, NULL },
-  { NULL, 2, "DirectoryString"},
-  { "pkcs", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "rsadsi", 1073741825, "113549"},
-  { "pkcs", 1, "1"},
-  { "pkcs-9", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs"},
-  { NULL, 1, "9"},
-  { "emailAddress", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "pkcs-9"},
-  { NULL, 1, "1"},
   { "Pkcs9email", 1612709890, "IA5String"},
   { "ub-emailaddress-length", 524298, "1"},
   { "Name", 1610612754, NULL },
@@ -552,38 +206,9 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "algorithm", 1073741836, NULL },
   { "parameters", 541081613, NULL },
   { "algorithm", 1, NULL },
-  { "pkcs-1", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs"},
-  { NULL, 1, "1"},
-  { "rsaEncryption", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-1"},
-  { NULL, 1, "1"},
-  { "md2WithRSAEncryption", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-1"},
-  { NULL, 1, "2"},
-  { "md5WithRSAEncryption", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-1"},
-  { NULL, 1, "4"},
-  { "sha1WithRSAEncryption", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-1"},
-  { NULL, 1, "5"},
-  { "id-dsa-with-sha1", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "x9-57", 1073741825, "10040"},
-  { "x9algorithm", 1073741825, "4"},
-  { NULL, 1, "3"},
   { "Dss-Sig-Value", 1610612741, NULL },
   { "r", 1073741827, NULL },
   { "s", 3, NULL },
-  { "dhpublicnumber", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "ansi-x942", 1073741825, "10046"},
-  { "number-type", 1073741825, "2"},
-  { NULL, 1, "1"},
   { "DomainParameters", 1610612741, NULL },
   { "p", 1073741827, NULL },
   { "g", 1073741827, NULL },
@@ -593,253 +218,26 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "ValidationParms", 1610612741, NULL },
   { "seed", 1073741830, NULL },
   { "pgenCounter", 3, NULL },
-  { "id-dsa", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "x9-57", 1073741825, "10040"},
-  { "x9algorithm", 1073741825, "4"},
-  { NULL, 1, "1"},
   { "Dss-Parms", 1610612741, NULL },
   { "p", 1073741827, NULL },
   { "q", 1073741827, NULL },
   { "g", 3, NULL },
-  { "ORAddress", 1610612741, NULL },
-  { "built-in-standard-attributes", 1073741826, "BuiltInStandardAttributes"},
-  { "built-in-domain-defined-attributes", 1073758210, "BuiltInDomainDefinedAttributes"},
-  { "extension-attributes", 16386, "ExtensionAttributes"},
-  { "BuiltInStandardAttributes", 1610612741, NULL },
-  { "country-name", 1073758210, "CountryName"},
-  { "administration-domain-name", 1073758210, "AdministrationDomainName"},
-  { "network-address", 1610637314, "NetworkAddress"},
-  { NULL, 2056, "0"},
-  { "terminal-identifier", 1610637314, "TerminalIdentifier"},
-  { NULL, 2056, "1"},
-  { "private-domain-name", 1610637314, "PrivateDomainName"},
-  { NULL, 2056, "2"},
-  { "organization-name", 1610637314, "OrganizationName"},
-  { NULL, 2056, "3"},
-  { "numeric-user-identifier", 1610637314, "NumericUserIdentifier"},
-  { NULL, 2056, "4"},
-  { "personal-name", 1610637314, "PersonalName"},
-  { NULL, 2056, "5"},
-  { "organizational-unit-names", 536895490, "OrganizationalUnitNames"},
-  { NULL, 2056, "6"},
   { "CountryName", 1610620946, NULL },
   { NULL, 1073746952, "1"},
   { "x121-dcc-code", 1612709890, "NumericString"},
   { NULL, 1048586, "ub-country-name-numeric-length"},
   { "iso-3166-alpha2-code", 538968066, "PrintableString"},
   { NULL, 1048586, "ub-country-name-alpha-length"},
-  { "AdministrationDomainName", 1610620946, NULL },
-  { NULL, 1073744904, "2"},
-  { "numeric", 1612709890, "NumericString"},
-  { "ub-domain-name-length", 524298, "0"},
-  { "printable", 538968066, "PrintableString"},
-  { "ub-domain-name-length", 524298, "0"},
-  { "NetworkAddress", 1073741826, "X121Address"},
-  { "X121Address", 1612709890, "NumericString"},
-  { "ub-x121-address-length", 524298, "1"},
-  { "TerminalIdentifier", 1612709890, "PrintableString"},
-  { "ub-terminal-id-length", 524298, "1"},
-  { "PrivateDomainName", 1610612754, NULL },
-  { "numeric", 1612709890, "NumericString"},
-  { "ub-domain-name-length", 524298, "1"},
-  { "printable", 538968066, "PrintableString"},
-  { "ub-domain-name-length", 524298, "1"},
   { "OrganizationName", 1612709890, "PrintableString"},
   { "ub-organization-name-length", 524298, "1"},
   { "NumericUserIdentifier", 1612709890, "NumericString"},
   { "ub-numeric-user-id-length", 524298, "1"},
-  { "PersonalName", 1610612750, NULL },
-  { "surname", 1814044674, "PrintableString"},
-  { NULL, 1073745928, "0"},
-  { "ub-surname-length", 524298, "1"},
-  { "given-name", 1814061058, "PrintableString"},
-  { NULL, 1073745928, "1"},
-  { "ub-given-name-length", 524298, "1"},
-  { "initials", 1814061058, "PrintableString"},
-  { NULL, 1073745928, "2"},
-  { "ub-initials-length", 524298, "1"},
-  { "generation-qualifier", 740319234, "PrintableString"},
-  { NULL, 1073745928, "3"},
-  { "ub-generation-qualifier-length", 524298, "1"},
   { "OrganizationalUnitNames", 1612709899, NULL },
   { "ub-organizational-units", 1074266122, "1"},
   { NULL, 2, "OrganizationalUnitName"},
   { "OrganizationalUnitName", 1612709890, "PrintableString"},
   { "ub-organizational-unit-name-length", 524298, "1"},
-  { "BuiltInDomainDefinedAttributes", 1612709899, NULL },
-  { "ub-domain-defined-attributes", 1074266122, "1"},
-  { NULL, 2, "BuiltInDomainDefinedAttribute"},
-  { "BuiltInDomainDefinedAttribute", 1610612741, NULL },
-  { "type", 1612709890, "PrintableString"},
-  { "ub-domain-defined-attribute-type-length", 524298, "1"},
-  { "value", 538968066, "PrintableString"},
-  { "ub-domain-defined-attribute-value-length", 524298, "1"},
-  { "ExtensionAttributes", 1612709903, NULL },
-  { "ub-extension-attributes", 1074266122, "1"},
-  { NULL, 2, "ExtensionAttribute"},
-  { "ExtensionAttribute", 1610612741, NULL },
-  { "extension-attribute-type", 1611145219, NULL },
-  { NULL, 1073743880, "0"},
-  { "0", 10, "ub-extension-attributes"},
-  { "extension-attribute-value", 541073421, NULL },
-  { NULL, 1073743880, "1"},
-  { "extension-attribute-type", 1, NULL },
-  { "common-name", 1342177283, "1"},
-  { "CommonName", 1612709890, "PrintableString"},
-  { "ub-common-name-length", 524298, "1"},
-  { "teletex-common-name", 1342177283, "2"},
-  { "TeletexCommonName", 1612709890, "TeletexString"},
-  { "ub-common-name-length", 524298, "1"},
-  { "teletex-organization-name", 1342177283, "3"},
-  { "TeletexOrganizationName", 1612709890, "TeletexString"},
-  { "ub-organization-name-length", 524298, "1"},
-  { "teletex-personal-name", 1342177283, "4"},
-  { "TeletexPersonalName", 1610612750, NULL },
-  { "surname", 1814044674, "TeletexString"},
-  { NULL, 1073743880, "0"},
-  { "ub-surname-length", 524298, "1"},
-  { "given-name", 1814061058, "TeletexString"},
-  { NULL, 1073743880, "1"},
-  { "ub-given-name-length", 524298, "1"},
-  { "initials", 1814061058, "TeletexString"},
-  { NULL, 1073743880, "2"},
-  { "ub-initials-length", 524298, "1"},
-  { "generation-qualifier", 740319234, "TeletexString"},
-  { NULL, 1073743880, "3"},
-  { "ub-generation-qualifier-length", 524298, "1"},
-  { "teletex-organizational-unit-names", 1342177283, "5"},
-  { "TeletexOrganizationalUnitNames", 1612709899, NULL },
-  { "ub-organizational-units", 1074266122, "1"},
-  { NULL, 2, "TeletexOrganizationalUnitName"},
-  { "TeletexOrganizationalUnitName", 1612709890, "TeletexString"},
-  { "ub-organizational-unit-name-length", 524298, "1"},
-  { "pds-name", 1342177283, "7"},
-  { "PDSName", 1612709890, "PrintableString"},
-  { "ub-pds-name-length", 524298, "1"},
-  { "physical-delivery-country-name", 1342177283, "8"},
-  { "PhysicalDeliveryCountryName", 1610612754, NULL },
-  { "x121-dcc-code", 1612709890, "NumericString"},
-  { NULL, 1048586, "ub-country-name-numeric-length"},
-  { "iso-3166-alpha2-code", 538968066, "PrintableString"},
-  { NULL, 1048586, "ub-country-name-alpha-length"},
-  { "postal-code", 1342177283, "9"},
-  { "PostalCode", 1610612754, NULL },
-  { "numeric-code", 1612709890, "NumericString"},
-  { "ub-postal-code-length", 524298, "1"},
-  { "printable-code", 538968066, "PrintableString"},
-  { "ub-postal-code-length", 524298, "1"},
-  { "physical-delivery-office-name", 1342177283, "10"},
-  { "PhysicalDeliveryOfficeName", 1073741826, "PDSParameter"},
-  { "physical-delivery-office-number", 1342177283, "11"},
-  { "PhysicalDeliveryOfficeNumber", 1073741826, "PDSParameter"},
-  { "extension-OR-address-components", 1342177283, "12"},
-  { "ExtensionORAddressComponents", 1073741826, "PDSParameter"},
-  { "physical-delivery-personal-name", 1342177283, "13"},
-  { "PhysicalDeliveryPersonalName", 1073741826, "PDSParameter"},
-  { "physical-delivery-organization-name", 1342177283, "14"},
-  { "PhysicalDeliveryOrganizationName", 1073741826, "PDSParameter"},
-  { "extension-physical-delivery-address-components", 1342177283, "15"},
-  { "ExtensionPhysicalDeliveryAddressComponents", 1073741826, "PDSParameter"},
-  { "unformatted-postal-address", 1342177283, "16"},
-  { "UnformattedPostalAddress", 1610612750, NULL },
-  { "printable-address", 1814052875, NULL },
-  { "ub-pds-physical-address-lines", 1074266122, "1"},
-  { NULL, 538968066, "PrintableString"},
-  { "ub-pds-parameter-length", 524298, "1"},
-  { "teletex-string", 740311042, "TeletexString"},
-  { "ub-unformatted-address-length", 524298, "1"},
-  { "street-address", 1342177283, "17"},
-  { "StreetAddress", 1073741826, "PDSParameter"},
-  { "post-office-box-address", 1342177283, "18"},
-  { "PostOfficeBoxAddress", 1073741826, "PDSParameter"},
-  { "poste-restante-address", 1342177283, "19"},
-  { "PosteRestanteAddress", 1073741826, "PDSParameter"},
-  { "unique-postal-name", 1342177283, "20"},
-  { "UniquePostalName", 1073741826, "PDSParameter"},
-  { "local-postal-attributes", 1342177283, "21"},
-  { "LocalPostalAttributes", 1073741826, "PDSParameter"},
-  { "PDSParameter", 1610612750, NULL },
-  { "printable-string", 1814052866, "PrintableString"},
-  { "ub-pds-parameter-length", 524298, "1"},
-  { "teletex-string", 740311042, "TeletexString"},
-  { "ub-pds-parameter-length", 524298, "1"},
-  { "extended-network-address", 1342177283, "22"},
-  { "ExtendedNetworkAddress", 1610612754, NULL },
-  { "e163-4-address", 1610612741, NULL },
-  { "number", 1612718082, "NumericString"},
-  { NULL, 1073743880, "0"},
-  { "ub-e163-4-number-length", 524298, "1"},
-  { "sub-address", 538992642, "NumericString"},
-  { NULL, 1073743880, "1"},
-  { "ub-e163-4-sub-address-length", 524298, "1"},
-  { "psap-address", 536879106, "PresentationAddress"},
-  { NULL, 2056, "0"},
-  { "PresentationAddress", 1610612741, NULL },
-  { "pSelector", 1610637319, NULL },
-  { NULL, 2056, "0"},
-  { "sSelector", 1610637319, NULL },
-  { NULL, 2056, "1"},
-  { "tSelector", 1610637319, NULL },
-  { NULL, 2056, "2"},
-  { "nAddresses", 538976271, NULL },
-  { NULL, 1073743880, "3"},
-  { "MAX", 1074266122, "1"},
-  { NULL, 7, NULL },
-  { "terminal-type", 1342177283, "23"},
-  { "TerminalType", 1610874883, NULL },
-  { "telex", 1073741825, "3"},
-  { "teletex", 1073741825, "4"},
-  { "g3-facsimile", 1073741825, "5"},
-  { "g4-facsimile", 1073741825, "6"},
-  { "ia5-terminal", 1073741825, "7"},
-  { "videotex", 1, "8"},
-  { "teletex-domain-defined-attributes", 1342177283, "6"},
-  { "TeletexDomainDefinedAttributes", 1612709899, NULL },
-  { "ub-domain-defined-attributes", 1074266122, "1"},
-  { NULL, 2, "TeletexDomainDefinedAttribute"},
-  { "TeletexDomainDefinedAttribute", 1610612741, NULL },
-  { "type", 1612709890, "TeletexString"},
-  { "ub-domain-defined-attribute-type-length", 524298, "1"},
-  { "value", 538968066, "TeletexString"},
-  { "ub-domain-defined-attribute-value-length", 524298, "1"},
-  { "ub-name", 1342177283, "32768"},
-  { "ub-common-name", 1342177283, "64"},
-  { "ub-locality-name", 1342177283, "128"},
-  { "ub-state-name", 1342177283, "128"},
-  { "ub-organization-name", 1342177283, "64"},
-  { "ub-organizational-unit-name", 1342177283, "64"},
-  { "ub-title", 1342177283, "64"},
-  { "ub-match", 1342177283, "128"},
-  { "ub-emailaddress-length", 1342177283, "128"},
-  { "ub-common-name-length", 1342177283, "64"},
-  { "ub-country-name-alpha-length", 1342177283, "2"},
-  { "ub-country-name-numeric-length", 1342177283, "3"},
-  { "ub-domain-defined-attributes", 1342177283, "4"},
-  { "ub-domain-defined-attribute-type-length", 1342177283, "8"},
-  { "ub-domain-defined-attribute-value-length", 1342177283, "128"},
-  { "ub-domain-name-length", 1342177283, "16"},
-  { "ub-extension-attributes", 1342177283, "256"},
-  { "ub-e163-4-number-length", 1342177283, "15"},
-  { "ub-e163-4-sub-address-length", 1342177283, "40"},
-  { "ub-generation-qualifier-length", 1342177283, "3"},
-  { "ub-given-name-length", 1342177283, "16"},
-  { "ub-initials-length", 1342177283, "5"},
-  { "ub-integer-options", 1342177283, "256"},
-  { "ub-numeric-user-id-length", 1342177283, "32"},
-  { "ub-organization-name-length", 1342177283, "64"},
-  { "ub-organizational-unit-name-length", 1342177283, "32"},
-  { "ub-organizational-units", 1342177283, "4"},
-  { "ub-pds-name-length", 1342177283, "16"},
-  { "ub-pds-parameter-length", 1342177283, "30"},
-  { "ub-pds-physical-address-lines", 1342177283, "6"},
-  { "ub-postal-code-length", 1342177283, "16"},
-  { "ub-surname-length", 1342177283, "40"},
-  { "ub-terminal-id-length", 1342177283, "24"},
-  { "ub-unformatted-address-length", 1342177283, "180"},
-  { "ub-x121-address-length", 1342177283, "16"},
+  { "CommonName", 1073741826, "PrintableString"},
   { "pkcs-7-ContentInfo", 1610612741, NULL },
   { "contentType", 1073741826, "pkcs-7-ContentType"},
   { "content", 541073421, NULL },
@@ -894,27 +292,12 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "signatureAlgorithm", 1073741826, "AlgorithmIdentifier"},
   { "signature", 6, NULL },
   { "pkcs-9-ub-challengePassword", 1342177283, "255"},
-  { "pkcs-9-certTypes", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-9"},
-  { NULL, 1, "22"},
-  { "pkcs-9-crlTypes", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-9"},
-  { NULL, 1, "23"},
-  { "pkcs-9-at-challengePassword", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-9"},
-  { NULL, 1, "7"},
   { "pkcs-9-challengePassword", 1610612754, NULL },
   { "printableString", 1612709890, "PrintableString"},
   { "pkcs-9-ub-challengePassword", 524298, "1"},
   { "utf8String", 538968066, "UTF8String"},
   { "pkcs-9-ub-challengePassword", 524298, "1"},
-  { "pkcs-9-at-localKeyId", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-9"},
-  { NULL, 1, "21"},
   { "pkcs-9-localKeyId", 1073741831, NULL },
-  { "pkcs-9-at-friendlyName", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-9"},
-  { NULL, 1, "20"},
   { "pkcs-9-friendlyName", 1612709890, "BMPString"},
   { "255", 524298, "1"},
   { "pkcs-8-PrivateKeyInfo", 1610612741, NULL },
@@ -932,29 +315,11 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "encryptionAlgorithm", 1073741826, "AlgorithmIdentifier"},
   { "encryptedData", 2, "pkcs-8-EncryptedData"},
   { "pkcs-8-EncryptedData", 1073741831, NULL },
-  { "pkcs-5", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs"},
-  { NULL, 1, "5"},
-  { "pkcs-5-encryptionAlgorithm", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "rsadsi", 1073741825, "113549"},
-  { NULL, 1, "3"},
-  { "pkcs-5-des-EDE3-CBC", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-5-encryptionAlgorithm"},
-  { NULL, 1, "7"},
   { "pkcs-5-des-EDE3-CBC-params", 1612709895, NULL },
   { NULL, 1048586, "8"},
-  { "pkcs-5-id-PBES2", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-5"},
-  { NULL, 1, "13"},
   { "pkcs-5-PBES2-params", 1610612741, NULL },
   { "keyDerivationFunc", 1073741826, "AlgorithmIdentifier"},
   { "encryptionScheme", 2, "AlgorithmIdentifier"},
-  { "pkcs-5-id-PBKDF2", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-5"},
-  { NULL, 1, "12"},
   { "pkcs-5-PBKDF2-params", 1610612741, NULL },
   { "salt", 1610612754, NULL },
   { "specified", 1073741831, NULL },
@@ -964,9 +329,6 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "keyLength", 1611153411, NULL },
   { "1", 10, "MAX"},
   { "prf", 16386, "AlgorithmIdentifier"},
-  { "pkcs-12", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs"},
-  { NULL, 1, "12"},
   { "pkcs-12-PFX", 1610612741, NULL },
   { "version", 1610874883, NULL },
   { "v3", 1, "3"},
@@ -991,22 +353,6 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "badId", 1, NULL },
   { "bagAttributes", 536887311, NULL },
   { NULL, 2, "pkcs-12-PKCS12Attribute"},
-  { "pkcs-12-bagtypes", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-12"},
-  { NULL, 1073741825, "10"},
-  { NULL, 1, "1"},
-  { "pkcs-12-keyBag", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-12-bagtypes"},
-  { NULL, 1, "1"},
-  { "pkcs-12-pkcs8ShroudedKeyBag", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-12-bagtypes"},
-  { NULL, 1, "2"},
-  { "pkcs-12-certBag", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-12-bagtypes"},
-  { NULL, 1, "3"},
-  { "pkcs-12-crlBag", 1879048204, NULL },
-  { NULL, 1073741825, "pkcs-12-bagtypes"},
-  { NULL, 1, "4"},
   { "pkcs-12-KeyBag", 1073741826, "pkcs-8-PrivateKeyInfo"},
   { "pkcs-12-PKCS8ShroudedKeyBag", 1073741826, "pkcs-8-EncryptedPrivateKeyInfo"},
   { "pkcs-12-CertBag", 1610612741, NULL },
@@ -1020,22 +366,6 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { NULL, 1073743880, "0"},
   { "crlId", 1, NULL },
   { "pkcs-12-PKCS12Attribute", 1073741826, "Attribute"},
-  { "pkcs-7-data", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "rsadsi", 1073741825, "113549"},
-  { "pkcs", 1073741825, "1"},
-  { "pkcs7", 1073741825, "7"},
-  { NULL, 1, "1"},
-  { "pkcs-7-encryptedData", 1879048204, NULL },
-  { "iso", 1073741825, "1"},
-  { "member-body", 1073741825, "2"},
-  { "us", 1073741825, "840"},
-  { "rsadsi", 1073741825, "113549"},
-  { "pkcs", 1073741825, "1"},
-  { "pkcs7", 1073741825, "7"},
-  { NULL, 1, "6"},
   { "pkcs-7-Data", 1073741831, NULL },
   { "pkcs-7-EncryptedData", 1610612741, NULL },
   { "version", 1073741826, "pkcs-7-CMSVersion"},
@@ -1052,61 +382,16 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "pkcs-7-UnprotectedAttributes", 1612709903, NULL },
   { "MAX", 1074266122, "1"},
   { NULL, 2, "Attribute"},
-  { "id-at-ldap-DC", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "0"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1073741825, "2342"},
-  { NULL, 1073741825, "19200300"},
-  { NULL, 1073741825, "100"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1, "25"},
   { "ldap-DC", 1073741826, "IA5String"},
-  { "id-at-ldap-UID", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "0"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1073741825, "2342"},
-  { NULL, 1073741825, "19200300"},
-  { NULL, 1073741825, "100"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1, "1"},
   { "ldap-UID", 1073741826, "DirectoryString"},
-  { "id-pda", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1, "9"},
-  { "id-pda-dateOfBirth", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pda"},
-  { NULL, 1, "1"},
   { "DateOfBirth", 1082130449, NULL },
-  { "id-pda-placeOfBirth", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pda"},
-  { NULL, 1, "2"},
   { "PlaceOfBirth", 1073741826, "DirectoryString"},
-  { "id-pda-gender", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pda"},
-  { NULL, 1, "3"},
   { "Gender", 1612709890, "PrintableString"},
   { NULL, 1048586, "1"},
-  { "id-pda-countryOfCitizenship", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pda"},
-  { NULL, 1, "4"},
   { "CountryOfCitizenship", 1612709890, "PrintableString"},
   { NULL, 1048586, "2"},
-  { "id-pda-countryOfResidence", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pda"},
-  { NULL, 1, "5"},
   { "CountryOfResidence", 1612709890, "PrintableString"},
   { NULL, 1048586, "2"},
-  { "id-pe-proxyCertInfo", 1879048204, NULL },
-  { NULL, 1073741825, "id-pe"},
-  { NULL, 1, "14"},
-  { "id-ppl-inheritAll", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1073741825, "21"},
-  { NULL, 1, "1"},
-  { "id-ppl-independent", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1073741825, "21"},
-  { NULL, 1, "2"},
   { "ProxyCertInfo", 1610612741, NULL },
   { "pCPathLenConstraint", 1611153411, NULL },
   { "0", 10, "MAX"},
@@ -1114,12 +399,6 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "ProxyPolicy", 1610612741, NULL },
   { "policyLanguage", 1073741836, NULL },
   { "policy", 16391, NULL },
-  { "id-on", 1879048204, NULL },
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1, "8"},
-  { "id-on-xmppAddr", 1879048204, NULL },
-  { NULL, 1073741825, "id-on"},
-  { NULL, 1, "5"},
   { "XmppAddr", 2, "UTF8String"},
   { NULL, 0, NULL }
 };
diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index 79b803227b..922552a064 100644
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -657,6 +657,7 @@ _gnutls_x509_encode_and_write_attribute (const char *given_oid,
   if (val_name == NULL)
     {
       gnutls_assert ();
+      _gnutls_x509_log ("Cannot find OID: %s\n", given_oid);
       return GNUTLS_E_X509_UNSUPPORTED_OID;
     }
 
diff --git a/tests/crq_key_id.c b/tests/crq_key_id.c
index c363d40226..e3f0978b09 100644
--- a/tests/crq_key_id.c
+++ b/tests/crq_key_id.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <gcrypt.h>
 #include <gnutls/gnutls.h>
@@ -32,6 +33,12 @@
 
 #include "utils.h"
 
+static void
+tls_log_func (int level, const char *str)
+{
+  fprintf (stderr, "%s |<%d>| %s", "crq_key_id", level, str);
+}
+
 void
 doit (void)
 {
@@ -54,6 +61,9 @@ doit (void)
   if (ret < 0)
     fail ("gnutls_global_init: %d\n", ret);
 
+  gnutls_global_set_log_function (tls_log_func);
+  gnutls_global_set_log_level (4711);
+
   for (algorithm = GNUTLS_PK_RSA; algorithm <= GNUTLS_PK_DSA; algorithm++)
     {
       ret = gnutls_x509_crq_init (&crq);