Name Constraints OID.

4 files changed, 20 insertions, 6 deletions

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 24d8855013..c16ff85819 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -62,12 +62,12 @@
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 720
-#define NUM_SN 715
-#define NUM_LN 715
-#define NUM_OBJ 689
+#define NUM_NID 721
+#define NUM_SN 716
+#define NUM_LN 716
+#define NUM_OBJ 690
 
-static unsigned char lvalues[4876]={
+static unsigned char lvalues[4879]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -757,6 +757,7 @@ static unsigned char lvalues[4876]={
 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4858] OBJ_ms_upn */
 0x55,0x1D,0x20,0x00,                         /* [4868] OBJ_any_policy */
 0x55,0x1D,0x21,                              /* [4872] OBJ_policy_mappings */
+0x55,0x1D,0x1E,                              /* [4875] OBJ_name_constraints */
 };
 
 static ASN1_OBJECT nid_objs[NUM_NID]={
@@ -1884,6 +1885,8 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"anyPolicy","X509v3 Any Policy",NID_any_policy,4,&(lvalues[4868]),0},
 {"policyMappings","X509v3 Policy Mappings",NID_policy_mappings,3,
 	&(lvalues[4872]),0},
+{"nameConstraints","X509v3 Name Constraints",NID_name_constraints,3,
+	&(lvalues[4875]),0},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -2320,6 +2323,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[717]),/* "msUPN" */
 &(nid_objs[481]),/* "nSRecord" */
 &(nid_objs[173]),/* "name" */
+&(nid_objs[720]),/* "nameConstraints" */
 &(nid_objs[369]),/* "noCheck" */
 &(nid_objs[403]),/* "noRevAvail" */
 &(nid_objs[72]),/* "nsBaseUrl" */
@@ -2697,6 +2701,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[126]),/* "X509v3 Extended Key Usage" */
 &(nid_objs[86]),/* "X509v3 Issuer Alternative Name" */
 &(nid_objs[83]),/* "X509v3 Key Usage" */
+&(nid_objs[720]),/* "X509v3 Name Constraints" */
 &(nid_objs[403]),/* "X509v3 No Revocation Available" */
 &(nid_objs[401]),/* "X509v3 Policy Constraints" */
 &(nid_objs[719]),/* "X509v3 Policy Mappings" */
@@ -3328,8 +3333,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[434]),/* OBJ_data                         0 9 */
 &(nid_objs[181]),/* OBJ_iso                          1 */
 &(nid_objs[182]),/* OBJ_member_body                  1 2 */
-&(nid_objs[379]),/* OBJ_org                          1 3 */
 &(nid_objs[527]),/* OBJ_identified_organization      1 3 */
+&(nid_objs[379]),/* OBJ_org                          1 3 */
 &(nid_objs[393]),/* OBJ_joint_iso_ccitt              2 */
 &(nid_objs[11]),/* OBJ_X500                         2 5 */
 &(nid_objs[380]),/* OBJ_dod                          1 3 6 */
@@ -3372,6 +3377,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[430]),/* OBJ_hold_instruction_code        2 5 29 23 */
 &(nid_objs[142]),/* OBJ_invalidity_date              2 5 29 24 */
 &(nid_objs[140]),/* OBJ_delta_crl                    2 5 29 27 */
+&(nid_objs[720]),/* OBJ_name_constraints             2 5 29 30 */
 &(nid_objs[103]),/* OBJ_crl_distribution_points      2 5 29 31 */
 &(nid_objs[89]),/* OBJ_certificate_policies         2 5 29 32 */
 &(nid_objs[719]),/* OBJ_policy_mappings              2 5 29 33 */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index eefdd169f2..9417e8c7c9 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -2031,6 +2031,11 @@
 #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
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 0a85cb6a4a..e84922d458 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -717,3 +717,4 @@ ms_smartcard_login		716
 ms_upn		717
 any_policy		718
 policy_mappings		719
+name_constraints		720
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index bea8db109d..feeed99b57 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -658,6 +658,8 @@ 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