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

[openssl.git] / crypto / objects / obj_mac.h

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 85d837bb7800101e7272c0a787779786098587fa..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 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 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_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 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"
 
 #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 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 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
 
 #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 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
 
 #define SN_clearance           "clearance"
 #define NID_clearance          395


@@ -1879,10 +1890,10 @@
 #define NID_commonName         13
 #define OBJ_commonName         OBJ_X509,3L
 
 #define NID_commonName         13
 #define OBJ_commonName         OBJ_X509,3L
 

-#define SN_surName             "SN"
-#define LN_surName             "surName"
-#define NID_surName            100
-#define OBJ_surName            OBJ_X509,4L
+#define SN_surname             "SN"
+#define LN_surname             "surname"
+#define NID_surname            100
+#define OBJ_surname            OBJ_X509,4L

 
 #define LN_serialNumber                "serialNumber"
 #define NID_serialNumber               105
 
 #define LN_serialNumber                "serialNumber"
 #define NID_serialNumber               105


@@ -2031,6 +2042,11 @@
 #define NID_delta_crl          140
 #define OBJ_delta_crl          OBJ_id_ce,27L
 
 #define NID_delta_crl          140
 #define OBJ_delta_crl          OBJ_id_ce,27L
 

+#define SN_name_constraints            "nameConstraints"
+#define LN_name_constraints            "X509v3 Name Constraints"
+#define NID_name_constraints           720
+#define OBJ_name_constraints           OBJ_id_ce,30L
+

 #define SN_crl_distribution_points             "crlDistributionPoints"
 #define LN_crl_distribution_points             "X509v3 CRL Distribution Points"
 #define NID_crl_distribution_points            103
 #define SN_crl_distribution_points             "crlDistributionPoints"
 #define LN_crl_distribution_points             "X509v3 CRL Distribution Points"
 #define NID_crl_distribution_points            103


@@ -2041,6 +2057,16 @@
 #define NID_certificate_policies               89
 #define OBJ_certificate_policies               OBJ_id_ce,32L
 
 #define NID_certificate_policies               89
 #define OBJ_certificate_policies               OBJ_id_ce,32L
 

+#define SN_any_policy          "anyPolicy"
+#define LN_any_policy          "X509v3 Any Policy"
+#define NID_any_policy         718
+#define OBJ_any_policy         OBJ_certificate_policies,0L
+
+#define SN_policy_mappings             "policyMappings"
+#define LN_policy_mappings             "X509v3 Policy Mappings"
+#define NID_policy_mappings            719
+#define OBJ_policy_mappings            OBJ_id_ce,33L
+

 #define SN_authority_key_identifier            "authorityKeyIdentifier"
 #define LN_authority_key_identifier            "X509v3 Authority Key Identifier"
 #define NID_authority_key_identifier           90
 #define SN_authority_key_identifier            "authorityKeyIdentifier"
 #define LN_authority_key_identifier            "X509v3 Authority Key Identifier"
 #define NID_authority_key_identifier           90


@@ -2317,7 +2343,7 @@
 
 #define SN_data                "data"
 #define NID_data               434
 
 #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
 
 #define SN_pss         "pss"
 #define NID_pss                435


@@ -2606,7 +2632,7 @@
 #define SN_id_set              "id-set"
 #define LN_id_set              "Secure Electronic Transactions"
 #define NID_id_set             576
 #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"
 
 #define SN_set_ctype           "set-ctype"
 #define LN_set_ctype           "content types"