Adjust the NID names for the AES modes OFB and CFB to contain the number

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index b6519a67d2eec418120a749e44ebdb4f17e831ea..9a969ccd3284a50fb7ed6dbfec56901ddc0775da 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -439,7 +439,6 @@ id-pda 2            : id-pda-placeOfBirth
 id-pda 3               : id-pda-gender
 id-pda 4               : id-pda-countryOfCitizenship
 id-pda 5               : id-pda-countryOfResidence
-id-pda 6               : id-pda-pseudonym
 
 # attribute certificate attributes
 id-aca 1               : id-aca-authenticationInfo
@@ -540,7 +539,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
 
@@ -645,17 +644,23 @@ enterprises 1466 344      : dcobject              : dcObject
 
 aes 1                  : AES-128-ECB           : aes-128-ecb
 aes 2                  : AES-128-CBC           : aes-128-cbc
+!Cname aes-128-ofb128
 aes 3                  : AES-128-OFB           : aes-128-ofb
+!Cname aes-128-cfb128
 aes 4                  : AES-128-CFB           : aes-128-cfb
 
 aes 21                 : AES-192-ECB           : aes-192-ecb
 aes 22                 : AES-192-CBC           : aes-192-cbc
+!Cname aes-192-ofb128
 aes 23                 : AES-192-OFB           : aes-192-ofb
+!Cname aes-192-cfb128
 aes 24                 : AES-192-CFB           : aes-192-cfb
 
 aes 41                 : AES-256-ECB           : aes-256-ecb
 aes 42                 : AES-256-CBC           : aes-256-cbc
+!Cname aes-256-ofb128
 aes 43                 : AES-256-OFB           : aes-256-ofb
+!Cname aes-256-cfb128
 aes 44                 : AES-256-CFB           : aes-256-cfb
 
 # Hold instruction CRL entry extension
@@ -696,7 +701,7 @@ pilotObjectClass 19 :                       : simpleSecurityObject
 pilotObjectClass 20    :                       : pilotOrganization
 pilotObjectClass 21    :                       : pilotDSA
 pilotObjectClass 22    :                       : qualityLabelledData
-pilotAttributeType 1   : userid
+pilotAttributeType 1   : UID                   : userId
 pilotAttributeType 2   :                       : textEncodedORAddress
 pilotAttributeType 3   :                       : rfc822Mailbox
 pilotAttributeType 4   : info