]> granicus.if.org Git - openssl/commitdiff
CABForum EV OIDs for Subject Jurisdiction of Incorporation or Registration.
authorRob Stradling <rob@comodo.com>
Tue, 25 Feb 2014 15:49:20 +0000 (15:49 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 26 Feb 2014 15:33:11 +0000 (15:33 +0000)
crypto/objects/obj_dat.h
crypto/objects/obj_mac.h
crypto/objects/obj_mac.num
crypto/objects/objects.txt

index aee9cbbf3bfa149a182a0d900ca8cdd1dadd769b..fb8c9bcb244dfe6462133ec4b35909f52cb24a64 100644 (file)
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 955
-#define NUM_SN 948
-#define NUM_LN 948
-#define NUM_OBJ 887
+#define NUM_NID 958
+#define NUM_SN 951
+#define NUM_LN 951
+#define NUM_OBJ 890
 
-static const unsigned char lvalues[6228]={
+static const unsigned char lvalues[6261]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -955,6 +955,9 @@ static const unsigned char lvalues[6228]={
 0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x03,/* [6197] OBJ_ct_precert_poison */
 0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x04,/* [6207] OBJ_ct_precert_signer */
 0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x05,/* [6217] OBJ_ct_cert_scts */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x01,/* [6227] OBJ_jurisdictionLocalityName */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x02,/* [6238] OBJ_jurisdictionStateOrProvinceName */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x3C,0x02,0x01,0x03,/* [6249] OBJ_jurisdictionCountryName */
 };
 
 static const ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2512,6 +2515,12 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
        10,&(lvalues[6207]),0},
 {"ct_cert_scts","CT Certificate SCTs",NID_ct_cert_scts,10,
        &(lvalues[6217]),0},
+{"jurisdictionL","jurisdictionLocalityName",
+       NID_jurisdictionLocalityName,11,&(lvalues[6227]),0},
+{"jurisdictionST","jurisdictionStateOrProvinceName",
+       NID_jurisdictionStateOrProvinceName,11,&(lvalues[6238]),0},
+{"jurisdictionC","jurisdictionCountryName",
+       NID_jurisdictionCountryName,11,&(lvalues[6249]),0},
 };
 
 static const unsigned int sn_objs[NUM_SN]={
@@ -3126,6 +3135,9 @@ static const unsigned int sn_objs[NUM_SN]={
 86,    /* "issuerAltName" */
 770,   /* "issuingDistributionPoint" */
 492,   /* "janetMailbox" */
+957,   /* "jurisdictionC" */
+955,   /* "jurisdictionL" */
+956,   /* "jurisdictionST" */
 150,   /* "keyBag" */
 83,    /* "keyUsage" */
 477,   /* "lastModifiedBy" */
@@ -4063,6 +4075,9 @@ static const unsigned int ln_objs[NUM_LN]={
 645,   /* "itu-t" */
 492,   /* "janetMailbox" */
 646,   /* "joint-iso-itu-t" */
+957,   /* "jurisdictionCountryName" */
+955,   /* "jurisdictionLocalityName" */
+956,   /* "jurisdictionStateOrProvinceName" */
 150,   /* "keyBag" */
 773,   /* "kisa" */
 477,   /* "lastModifiedBy" */
@@ -5304,5 +5319,8 @@ static const unsigned int obj_objs[NUM_OBJ]={
 154,   /* OBJ_secretBag                    1 2 840 113549 1 12 10 1 5 */
 155,   /* OBJ_safeContentsBag              1 2 840 113549 1 12 10 1 6 */
 34,    /* OBJ_idea_cbc                     1 3 6 1 4 1 188 7 1 1 2 */
+955,   /* OBJ_jurisdictionLocalityName     1 3 6 1 4 1 311 60 2 1 1 */
+956,   /* OBJ_jurisdictionStateOrProvinceName 1 3 6 1 4 1 311 60 2 1 2 */
+957,   /* OBJ_jurisdictionCountryName      1 3 6 1 4 1 311 60 2 1 3 */
 };
 
index 71590387eda4da6bcac96f6099c3b6b81290e38c..f0690b0683d8af3ad064bd7e67d791398e795118 100644 (file)
 #define NID_ct_cert_scts               954
 #define OBJ_ct_cert_scts               1L,3L,6L,1L,4L,1L,11129L,2L,4L,5L
 
+#define SN_jurisdictionLocalityName            "jurisdictionL"
+#define LN_jurisdictionLocalityName            "jurisdictionLocalityName"
+#define NID_jurisdictionLocalityName           955
+#define OBJ_jurisdictionLocalityName           1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,1L
+
+#define SN_jurisdictionStateOrProvinceName             "jurisdictionST"
+#define LN_jurisdictionStateOrProvinceName             "jurisdictionStateOrProvinceName"
+#define NID_jurisdictionStateOrProvinceName            956
+#define OBJ_jurisdictionStateOrProvinceName            1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,2L
+
+#define SN_jurisdictionCountryName             "jurisdictionC"
+#define LN_jurisdictionCountryName             "jurisdictionCountryName"
+#define NID_jurisdictionCountryName            957
+#define OBJ_jurisdictionCountryName            1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,3L
+
index 0b04b9d08302ab39074389e0ecf2a8f472f477fb..8e5ea8336331ec39f62f65d4405e2b68c26241a4 100644 (file)
@@ -952,3 +952,6 @@ ct_precert_scts             951
 ct_precert_poison              952
 ct_precert_signer              953
 ct_cert_scts           954
+jurisdictionLocalityName               955
+jurisdictionStateOrProvinceName                956
+jurisdictionCountryName                957
index 77e953683178b88ec19f4ba386b375d2a2242d7e..b57aabb226501b1b17ae892fd44af9b796b2a6f9 100644 (file)
@@ -1341,3 +1341,10 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
 1 3 6 1 4 1 11129 2 4 3        : ct_precert_poison             : CT Precertificate Poison
 1 3 6 1 4 1 11129 2 4 4        : ct_precert_signer             : CT Precertificate Signer
 1 3 6 1 4 1 11129 2 4 5        : ct_cert_scts                  : CT Certificate SCTs
+
+# CABForum EV SSL Certificate Guidelines
+# (see https://cabforum.org/extended-validation/)
+# OIDs for Subject Jurisdiction of Incorporation or Registration
+1 3 6 1 4 1 311 60 2 1 1       : jurisdictionL         : jurisdictionLocalityName
+1 3 6 1 4 1 311 60 2 1 2       : jurisdictionST        : jurisdictionStateOrProvinceName
+1 3 6 1 4 1 311 60 2 1 3       : jurisdictionC         : jurisdictionCountryName