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

make update

PR: 80

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 9417e8c7c99d7c3a3dc64170dbcaa27600dc5ad5..2715cfdd75713a28e991742554ed41b8aafdd118 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -67,20 +67,26 @@
 #define NID_undef                      0
 #define OBJ_undef                      0L
 
-#define SN_ccitt               "CCITT"
-#define LN_ccitt               "ccitt"
+#define SN_itu_t               "ITU-T"
+#define LN_itu_t               "itu-t"
+#define NID_itu_t              721
+#define OBJ_itu_t              0L
+
 #define NID_ccitt              404
-#define OBJ_ccitt              0L
+#define OBJ_ccitt              OBJ_itu_t
 
 #define SN_iso         "ISO"
 #define LN_iso         "iso"
 #define NID_iso                181
 #define OBJ_iso                1L
 
-#define SN_joint_iso_ccitt             "JOINT-ISO-CCITT"
-#define LN_joint_iso_ccitt             "joint-iso-ccitt"
+#define SN_joint_iso_itu_t             "JOINT-ISO-ITU-T"
+#define LN_joint_iso_itu_t             "joint-iso-itu-t"
+#define NID_joint_iso_itu_t            722
+#define OBJ_joint_iso_itu_t            2L
+
 #define NID_joint_iso_ccitt            393
-#define OBJ_joint_iso_ccitt            2L
+#define OBJ_joint_iso_ccitt            OBJ_joint_iso_itu_t
 
 #define SN_member_body         "member-body"
 #define LN_member_body         "ISO Member Body"
@@ -95,9 +101,14 @@
 #define NID_certicom_arc               528
 #define OBJ_certicom_arc               OBJ_identified_organization,132L
 
+#define SN_international_organizations         "international-organizations"
+#define LN_international_organizations         "International Organizations"
+#define NID_international_organizations                723
+#define OBJ_international_organizations                OBJ_joint_iso_itu_t,23L
+
 #define SN_wap         "wap"
 #define NID_wap                562
-#define OBJ_wap                OBJ_joint_iso_ccitt,23L,43L
+#define OBJ_wap                OBJ_international_organizations,43L
 
 #define SN_wap_wsg             "wap-wsg"
 #define NID_wap_wsg            563
@@ -106,7 +117,7 @@
 #define SN_selected_attribute_types            "selected-attribute-types"
 #define LN_selected_attribute_types            "Selected Attribute Types"
 #define NID_selected_attribute_types           394
-#define OBJ_selected_attribute_types           OBJ_joint_iso_ccitt,5L,1L,5L
+#define OBJ_selected_attribute_types           OBJ_joint_iso_itu_t,5L,1L,5L
 
 #define SN_clearance           "clearance"
 #define NID_clearance          395
@@ -2332,7 +2343,7 @@
 
 #define SN_data                "data"
 #define NID_data               434
-#define OBJ_data               OBJ_ccitt,9L
+#define OBJ_data               OBJ_itu_t,9L
 
 #define SN_pss         "pss"
 #define NID_pss                435
@@ -2621,7 +2632,7 @@
 #define SN_id_set              "id-set"
 #define LN_id_set              "Secure Electronic Transactions"
 #define NID_id_set             576
-#define OBJ_id_set             2L,23L,42L
+#define OBJ_id_set             OBJ_international_organizations,42L
 
 #define SN_set_ctype           "set-ctype"
 #define LN_set_ctype           "content types"

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index e84922d458efb026207b36f4048cfb70981d43a3..0840bac3066f5bed9cea82cfae9242bbbf1c12bc 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -718,3 +718,6 @@ ms_upn              717
 any_policy             718
 policy_mappings                719
 name_constraints               720
+itu_t          721
+joint_iso_itu_t                722
+international_organizations            723

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index feeed99b57a75ac602543afb104c629d540a5636..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
 
@@ -781,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
@@ -857,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