Replace CCITT with ITU-T. Keep CCITT around as an alias.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 8c204be2dd7fdc4ed5849f4fe64717203be0621d..b5209b6fda594f92a45ad7f928e020a3ec21c487 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1,8 +1,11 @@
-0                      : CCITT                 : ccitt
+# CCITT was renamed to ITU-T quite some time ago
+0                      : ITU-T                 : itu-t
+!Alias ccitt itu-t
 
 1                      : ISO                   : iso
 
-2                      : JOINT-ISO-CCITT       : joint-iso-ccitt
+2                      : JOINT-ISO-ITU-T       : joint-iso-itu-t
+!Alias joint-iso-ccitt joint-iso-itu-t
 
 iso 2                  : member-body           : ISO Member Body
 
@@ -10,10 +13,12 @@ iso 3                       : identified-organization
 
 identified-organization 132    : certicom-arc
 
-joint-iso-ccitt 23 43  : wap
+joint-iso-itu-t 23     : international-organizations   : International Organizations
+
+international-organizations 43 : wap
 wap 13                 : wap-wsg
 
-joint-iso-ccitt 5 1 5  : selected-attribute-types      : Selected Attribute Types
+joint-iso-itu-t 5 1 5  : selected-attribute-types      : Selected Attribute Types
 
 selected-attribute-types 55    : clearance
 
@@ -83,9 +88,13 @@ secg-ellipticCurve 9         : secp160k1
 secg-ellipticCurve 8           : secp160r1
 secg-ellipticCurve 30          : secp160r2
 secg-ellipticCurve 31          : secp192k1
+# NOTE: the curve secp192r1 is the same as prime192v1 defined above
+#       and is therefore omitted
 secg-ellipticCurve 32          : secp224k1
 secg-ellipticCurve 33          : secp224r1
 secg-ellipticCurve 10          : secp256k1
+# NOTE: the curve secp256r1 is the same as prime256v1 defined above
+#       and is therefore omitted
 secg-ellipticCurve 34          : secp384r1
 secg-ellipticCurve 35          : secp521r1
 # SECG characteristic two curves OIDs
@@ -610,8 +619,7 @@ algorithm 29                : RSA-SHA1-2            : sha1WithRSA
 
 X500 4                 : X509
 X509 3                 : CN                    : commonName
-!Cname surname
-X509 4                 : SN                    : surName
+X509 4                 : SN                    : surname
 X509 5                 :                       : serialNumber
 X509 6                 : C                     : countryName
 X509 7                 : L                     : localityName
@@ -655,10 +663,16 @@ id-ce 21          : CRLReason             : X509v3 CRL Reason Code
 id-ce 24               : invalidityDate        : Invalidity Date
 !Cname delta-crl
 id-ce 27               : deltaCRL              : X509v3 Delta CRL Indicator
+!Cname name-constraints
+id-ce 30               : nameConstraints       : X509v3 Name Constraints
 !Cname crl-distribution-points
 id-ce 31               : crlDistributionPoints : X509v3 CRL Distribution Points
 !Cname certificate-policies
 id-ce 32               : certificatePolicies   : X509v3 Certificate Policies
+!Cname any-policy
+certificate-policies 0 : anyPolicy             : X509v3 Any Policy
+!Cname policy-mappings
+id-ce 33               : policyMappings        : X509v3 Policy Mappings
 !Cname authority-key-identifier
 id-ce 35               : authorityKeyIdentifier : X509v3 Authority Key Identifier
 !Cname policy-constraints
@@ -772,9 +786,9 @@ holdInstruction 2   : holdInstructionCallIssuer : Hold Instruction Call Issuer
 !Cname hold-instruction-reject
 holdInstruction 3      : holdInstructionReject : Hold Instruction Reject
 
-# OID's from CCITT.  Most of this is defined in RFC 1274.  A couple of
+# OID's from ITU-T.  Most of this is defined in RFC 1274.  A couple of
 # them are also mentioned in RFC 2247
-ccitt 9                        : data
+itu-t 9                        : data
 data 2342              : pss
 pss 19200300           : ucl
 ucl 100                        : pilot
@@ -848,7 +862,7 @@ pilotAttributeType 54       :                       : dITRedirect
 pilotAttributeType 55  : audio
 pilotAttributeType 56  :                       : documentPublisher
 
-2 23 42                        : id-set                : Secure Electronic Transactions
+international-organizations 42 : id-set        : Secure Electronic Transactions
 
 id-set 0               : set-ctype             : content types
 id-set 1               : set-msgExt            : message extensions