synchronize with engine branch (some changes were done only

[oweals/openssl.git] / crypto / objects / objects.txt

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 5741ef5fc421fc2ea92e69830d3c2c4bd8355b6e..fb73408f46577b7672723816b4a64bf72527b5a4 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -406,10 +406,9 @@ id-on 1                    : id-on-personalData
 # personal data attributes
 id-pda 1               : id-pda-dateOfBirth
 id-pda 2               : id-pda-placeOfBirth
-id-pda 3               : id-pda-pseudonym
-id-pda 4               : id-pda-gender
-id-pda 5               : id-pda-countryOfCitizenship
-id-pda 6               : id-pda-countryOfResidence
+id-pda 3               : id-pda-gender
+id-pda 4               : id-pda-countryOfCitizenship
+id-pda 5               : id-pda-countryOfResidence
 
 # attribute certificate attributes
 id-aca 1               : id-aca-authenticationInfo
@@ -508,7 +507,7 @@ X509 13                     : D                     : description
 X509 41                        : name                  : name
 X509 42                        : G                     : givenName
 X509 43                        : I                     : initials
-X509 45                        : UID                   : uniqueIdentifier
+X509 45                        :                       : uniqueIdentifier
 X509 46                        : dnQualifier           : dnQualifier
 X509 72                        : role                  : role
 
@@ -594,10 +593,10 @@ internet 5                : security              : Security
 internet 6             : snmpv2                : SNMPv2
 internet 7             : mail                  : Mail
 
-private 1              : enterprises           : Enterprises
+Private 1              : enterprises           : Enterprises
 
 # RFC 2247
-enterprises 1466 344   : dcobject              : dcObject
+Enterprises 1466 344   : dcobject              : dcObject
 
 # Stray OIDs we don't know the full name of each step for
 # RFC 2247