No need for those OIDs any more.

1 files changed, 0 insertions, 106 deletions

diff --git a/lib/pkix.asn b/lib/pkix.asn
index e10cae3561..1e9a4f0f72 100644
--- 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 {