Add Content Type OID for RPKI id-ct-signedTAL

References: draft-ietf-sidrops-signed-tal
Title: "RPKI Signed Object for Trust Anchor Key"

OID permanently assigned under 'SMI Security for S/MIME CMS Content Type (1.2.840.113549.1.9.16.1)'
https://www.iana.org/assignments/smi-numbers/smi-numbers.xhtml#security-smime-1

CLA: trivial

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19221)

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 5d13a73ac4fed1e3646f3a778d5c36cb995e4c9c..cd83f24e8d2d2fb98835b0a79a12d22b1610d115 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -10,7 +10,7 @@
  */
 
 /* Serialized OID's */
-static const unsigned char so[8345] = {
+static const unsigned char so[8356] = {
     0x2A,0x86,0x48,0x86,0xF7,0x0D,                 /* [    0] OBJ_rsadsi */
     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,            /* [    6] OBJ_pkcs */
     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02,       /* [   13] OBJ_md2 */
@@ -1151,9 +1151,10 @@ static const unsigned char so[8345] = {
     0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x11,0x03,0x01,  /* [ 8315] OBJ_hmacWithSM3 */
     0x60,0x86,0x48,0x01,0x86,0xF9,0x66,            /* [ 8325] OBJ_oracle */
     0x60,0x86,0x48,0x01,0x86,0xF9,0x66,0xAD,0xCA,0x7B,0x01,0x01,  /* [ 8332] OBJ_oracle_jdk_trustedkeyusage */
+    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x32,  /* [ 8344] OBJ_id_ct_signedTAL */
 };
 
-#define NUM_NID 1284
+#define NUM_NID 1285
 static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"UNDEF", "undefined", NID_undef},
     {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@@ -2439,9 +2440,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"hmacWithSM3", "hmacWithSM3", NID_hmacWithSM3, 10, &so[8315]},
     {"oracle-organization", "Oracle organization", NID_oracle, 7, &so[8325]},
     {"oracle-jdk-trustedkeyusage", "Trusted key usage (Oracle)", NID_oracle_jdk_trustedkeyusage, 12, &so[8332]},
+    {"id-ct-signedTAL", "id-ct-signedTAL", NID_id_ct_signedTAL, 11, &so[8344]},
 };
 
-#define NUM_SN 1275
+#define NUM_SN 1276
 static const unsigned int sn_objs[NUM_SN] = {
      364,    /* "AD_DVCS" */
      419,    /* "AES-128-CBC" */
@@ -3081,6 +3083,7 @@ static const unsigned int sn_objs[NUM_SN] = {
     1236,    /* "id-ct-rpkiGhostbusters" */
     1235,    /* "id-ct-rpkiManifest" */
     1247,    /* "id-ct-signedChecklist" */
+    1284,    /* "id-ct-signedTAL" */
     1060,    /* "id-ct-xml" */
     1108,    /* "id-dsa-with-sha3-224" */
     1109,    /* "id-dsa-with-sha3-256" */
@@ -3720,7 +3723,7 @@ static const unsigned int sn_objs[NUM_SN] = {
     1093,    /* "x509ExtAdmission" */
 };
 
-#define NUM_LN 1275
+#define NUM_LN 1276
 static const unsigned int ln_objs[NUM_LN] = {
      363,    /* "AD Time Stamping" */
      405,    /* "ANSI X9.62" */
@@ -4378,6 +4381,7 @@ static const unsigned int ln_objs[NUM_LN] = {
     1236,    /* "id-ct-rpkiGhostbusters" */
     1235,    /* "id-ct-rpkiManifest" */
     1247,    /* "id-ct-signedChecklist" */
+    1284,    /* "id-ct-signedTAL" */
     1060,    /* "id-ct-xml" */
      408,    /* "id-ecPublicKey" */
      508,    /* "id-hex-multipart-message" */
@@ -4999,7 +5003,7 @@ static const unsigned int ln_objs[NUM_LN] = {
      125,    /* "zlib compression" */
 };
 
-#define NUM_OBJ 1146
+#define NUM_OBJ 1147
 static const unsigned int obj_objs[NUM_OBJ] = {
        0,    /* OBJ_undef                        0 */
      181,    /* OBJ_iso                          1 */
@@ -6072,6 +6076,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
     1246,    /* OBJ_id_ct_geofeedCSVwithCRLF     1 2 840 113549 1 9 16 1 47 */
     1247,    /* OBJ_id_ct_signedChecklist        1 2 840 113549 1 9 16 1 48 */
     1250,    /* OBJ_id_ct_ASPA                   1 2 840 113549 1 9 16 1 49 */
+    1284,    /* OBJ_id_ct_signedTAL              1 2 840 113549 1 9 16 1 50 */
      212,    /* OBJ_id_smime_aa_receiptRequest   1 2 840 113549 1 9 16 2 1 */
      213,    /* OBJ_id_smime_aa_securityLabel    1 2 840 113549 1 9 16 2 2 */
      214,    /* OBJ_id_smime_aa_mlExpandHistory  1 2 840 113549 1 9 16 2 3 */

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index e56d96336c6d47f35d70ce85b87e63333fdf46ac..f4e70da2cd5bcbf52b7e7496fae2f7499284ac6f 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1281,3 +1281,4 @@ id_aa_ets_archiveTimestampV2              1280
 hmacWithSM3            1281
 oracle         1282
 oracle_jdk_trustedkeyusage             1283
+id_ct_signedTAL                1284

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 6c831141cdad6efd671e8f7c8d5572f045590eb9..a03f682d5ec5c988f44bbd643dd23830e34355e5 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -283,6 +283,7 @@ id-smime-ct 36              : id-ct-resourceTaggedAttest
 id-smime-ct 47         : id-ct-geofeedCSVwithCRLF
 id-smime-ct 48         : id-ct-signedChecklist
 id-smime-ct 49         : id-ct-ASPA
+id-smime-ct 50         : id-ct-signedTAL
 
 # S/MIME Attributes
 id-smime-aa 1          : id-smime-aa-receiptRequest

diff --git a/fuzz/oids.txt b/fuzz/oids.txt
index 57be5f1674ea5a35c7db2f841b2ba51a44c0aa94..3eb51375a3df61bbd1343bb3ab1ba19ad505718f 100644 (file)
--- a/fuzz/oids.txt
+++ b/fuzz/oids.txt
@@ -1147,3 +1147,4 @@ OBJ_id_aa_ets_archiveTimestampV2="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x02\x30"
 OBJ_hmacWithSM3="\x2A\x81\x1C\xCF\x55\x01\x83\x11\x03\x01"
 OBJ_oracle="\x60\x86\x48\x01\x86\xF9\x66"
 OBJ_oracle_jdk_trustedkeyusage="\x60\x86\x48\x01\x86\xF9\x66\xAD\xCA\x7B\x01\x01"
+OBJ_id_ct_signedTAL="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x32"

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index e8c18b077feaab2e5e69a79f4cccd5e45da43555..e1cafb01091ee6c555a1bb3e501eaff4b1abbfbc 100644 (file)
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -890,6 +890,10 @@
 #define NID_id_ct_ASPA          1250
 #define OBJ_id_ct_ASPA          OBJ_id_smime_ct,49L
 
+#define SN_id_ct_signedTAL              "id-ct-signedTAL"
+#define NID_id_ct_signedTAL             1284
+#define OBJ_id_ct_signedTAL             OBJ_id_smime_ct,50L
+
 #define SN_id_smime_aa_receiptRequest           "id-smime-aa-receiptRequest"
 #define NID_id_smime_aa_receiptRequest          212
 #define OBJ_id_smime_aa_receiptRequest          OBJ_id_smime_aa,1L