No need for those OIDs any more.

diff --git a/lib/pkix.asn b/lib/pkix.asn
index e10cae3561289d8a155a1aab747270bd11927534..1e9a4f0f727b9e3de2c64e206e00b569a458a857 100644 (file)
--- a/lib/pkix.asn
+++ b/lib/pkix.asn
@@ -169,87 +169,8 @@ id-at           OBJECT IDENTIFIER ::= {joint-iso-ccitt(2) ds(5) 4}
 -- Maybe this is inefficient and memory consuming. Should we replace with
 -- a table that maps OIDs to structures?
 
-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-businessCategory AttributeType ::=     {id-at 15}
-businessCategory ::= 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-jurisdictionOfIncorporationLocalityName      AttributeType   ::=     {1 3 6 1 4 1 311 60 2 1 1}
-EV_jurisdictionOfIncorporationLocalityName ::= X520LocalityName
-
-id-at-jurisdictionOfIncorporationStateOrProvinceName      AttributeType   ::=     {1 3 6 1 4 1 311 60 2 1 2}
-EV_jurisdictionOfIncorporationStateOrProvinceName ::= X520StateOrProvinceName
-
-id-at-jurisdictionOfIncorporationCountryName      AttributeType   ::=     {1 3 6 1 4 1 311 60 2 1 3}
-EV_jurisdictionOfIncorporationCountryName ::= X520countryName
-
-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
 
-id-at-postalCode     AttributeType   ::=     {id-at 17}
-X520postalCode ::= DirectoryString
-
  -- Legacy attributes
 
 emailAddress AttributeType      ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 1 }
@@ -637,33 +558,6 @@ pkcs-7-EncryptedContent ::= OCTET STRING
 
 pkcs-7-UnprotectedAttributes ::= SET SIZE (1..MAX) OF Attribute
 
--- LDAP stuff
-
-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-dateOfBirth          AttributeType ::= { id-pkix 9  1 }
-DateOfBirth ::=             GeneralizedTime
-
-id-pda-placeOfBirth         AttributeType ::= { id-pkix 9  2 }
-PlaceOfBirth ::=            DirectoryString
-
-id-pda-gender               AttributeType ::= { id-pkix 9  3 }
-Gender ::=                  PrintableString (SIZE(1))
-
-id-pda-countryOfCitizenship AttributeType ::= { id-pkix 9  4 }
-CountryOfCitizenship ::=    PrintableString (SIZE (2))
-                            -- ISO 3166 Country Code
-
-id-pda-countryOfResidence   AttributeType ::= { id-pkix 9  5 }
-CountryOfResidence ::=      PrintableString (SIZE (2))
-                            -- ISO 3166 Country Code
-
 -- rfc3820
 
 ProxyCertInfo ::= SEQUENCE {

diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c
index cdd8604f45386b8a388504ae5fd224bcb4ee480c..8c5183f874b35882df29bca963d772ab54ee6079 100644 (file)
--- a/lib/pkix_asn1_tab.c
+++ b/lib/pkix_asn1_tab.c
@@ -123,140 +123,8 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
   { "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-businessCategory", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "15"},
-  { "businessCategory", 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-jurisdictionOfIncorporationLocalityName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "3"},
-  { NULL, 1073741825, "6"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "4"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "311"},
-  { NULL, 1073741825, "60"},
-  { NULL, 1073741825, "2"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1, "1"},
-  { "EV_jurisdictionOfIncorporationLocalityName", 1073741826, "X520LocalityName"},
-  { "id-at-jurisdictionOfIncorporationStateOrProvinceName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "3"},
-  { NULL, 1073741825, "6"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "4"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "311"},
-  { NULL, 1073741825, "60"},
-  { NULL, 1073741825, "2"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1, "2"},
-  { "EV_jurisdictionOfIncorporationStateOrProvinceName", 1073741826, "X520StateOrProvinceName"},
-  { "id-at-jurisdictionOfIncorporationCountryName", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "3"},
-  { NULL, 1073741825, "6"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "4"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1073741825, "311"},
-  { NULL, 1073741825, "60"},
-  { NULL, 1073741825, "2"},
-  { NULL, 1073741825, "1"},
-  { NULL, 1, "3"},
-  { "EV_jurisdictionOfIncorporationCountryName", 1073741826, "X520countryName"},
-  { "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"},
-  { "id-at-postalCode", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-at"},
-  { NULL, 1, "17"},
-  { "X520postalCode", 1073741826, "DirectoryString"},
   { "emailAddress", 1880096780, "AttributeType"},
   { "iso", 1073741825, "1"},
   { "member-body", 1073741825, "2"},
@@ -547,52 +415,6 @@ 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-dateOfBirth", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1, "1"},
-  { "DateOfBirth", 1082130449, NULL },
-  { "id-pda-placeOfBirth", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1, "2"},
-  { "PlaceOfBirth", 1073741826, "DirectoryString"},
-  { "id-pda-gender", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1, "3"},
-  { "Gender", 1612709890, "PrintableString"},
-  { NULL, 1048586, "1"},
-  { "id-pda-countryOfCitizenship", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1, "4"},
-  { "CountryOfCitizenship", 1612709890, "PrintableString"},
-  { NULL, 1048586, "2"},
-  { "id-pda-countryOfResidence", 1880096780, "AttributeType"},
-  { NULL, 1073741825, "id-pkix"},
-  { NULL, 1073741825, "9"},
-  { NULL, 1, "5"},
-  { "CountryOfResidence", 1612709890, "PrintableString"},
-  { NULL, 1048586, "2"},
   { "ProxyCertInfo", 1610612741, NULL },
   { "pCPathLenConstraint", 1611153411, NULL },
   { "0", 10, "MAX"},