Add OID for draft-ietf-opsawg-finding-geofeeds detached CMS signature

RFC 8805 Geofeed files can be authenticated with RPKI

CLA: trivial

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14050)

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 697cd527b34baa3ebcebb5770361ceb3ff100a41..3ce82bf4e6dc8215e944f82fb2fd01548cf9882c 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[8054] = {
+static const unsigned char so[8065] = {
     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 */
@@ -1113,9 +1113,10 @@ static const unsigned char so[8054] = {
     0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x0A,       /* [ 8029] OBJ_rpkiManifest */
     0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x0B,       /* [ 8037] OBJ_signedObject */
     0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x0D,       /* [ 8045] OBJ_rpkiNotify */
+    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x2F,  /* [ 8053] OBJ_id_ct_geofeedCSVwithCRLF */
 };
 
-#define NUM_NID 1246
+#define NUM_NID 1247
 static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"UNDEF", "undefined", NID_undef},
     {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@@ -2363,9 +2364,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"rpkiManifest", "RPKI Manifest", NID_rpkiManifest, 8, &so[8029]},
     {"signedObject", "Signed Object", NID_signedObject, 8, &so[8037]},
     {"rpkiNotify", "RPKI Notify", NID_rpkiNotify, 8, &so[8045]},
+    {"id-ct-geofeedCSVwithCRLF", "id-ct-geofeedCSVwithCRLF", NID_id_ct_geofeedCSVwithCRLF, 11, &so[8053]},
 };
 
-#define NUM_SN 1237
+#define NUM_SN 1238
 static const unsigned int sn_objs[NUM_SN] = {
      364,    /* "AD_DVCS" */
      419,    /* "AES-128-CBC" */
@@ -2977,6 +2979,7 @@ static const unsigned int sn_objs[NUM_SN] = {
      331,    /* "id-cmc-transactionId" */
     1238,    /* "id-cp" */
      787,    /* "id-ct-asciiTextWithCRLF" */
+    1246,    /* "id-ct-geofeedCSVwithCRLF" */
     1237,    /* "id-ct-resourceTaggedAttest" */
     1234,    /* "id-ct-routeOriginAuthz" */
     1236,    /* "id-ct-rpkiGhostbusters" */
@@ -3606,7 +3609,7 @@ static const unsigned int sn_objs[NUM_SN] = {
     1093,    /* "x509ExtAdmission" */
 };
 
-#define NUM_LN 1237
+#define NUM_LN 1238
 static const unsigned int ln_objs[NUM_LN] = {
      363,    /* "AD Time Stamping" */
      405,    /* "ANSI X9.62" */
@@ -4236,6 +4239,7 @@ static const unsigned int ln_objs[NUM_LN] = {
      331,    /* "id-cmc-transactionId" */
     1238,    /* "id-cp" */
      787,    /* "id-ct-asciiTextWithCRLF" */
+    1246,    /* "id-ct-geofeedCSVwithCRLF" */
     1237,    /* "id-ct-resourceTaggedAttest" */
     1234,    /* "id-ct-routeOriginAuthz" */
     1236,    /* "id-ct-rpkiGhostbusters" */
@@ -4847,7 +4851,7 @@ static const unsigned int ln_objs[NUM_LN] = {
      125,    /* "zlib compression" */
 };
 
-#define NUM_OBJ 1108
+#define NUM_OBJ 1109
 static const unsigned int obj_objs[NUM_OBJ] = {
        0,    /* OBJ_undef                        0 */
      181,    /* OBJ_iso                          1 */
@@ -5886,6 +5890,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
     1060,    /* OBJ_id_ct_xml                    1 2 840 113549 1 9 16 1 28 */
     1236,    /* OBJ_id_ct_rpkiGhostbusters       1 2 840 113549 1 9 16 1 35 */
     1237,    /* OBJ_id_ct_resourceTaggedAttest   1 2 840 113549 1 9 16 1 36 */
+    1246,    /* OBJ_id_ct_geofeedCSVwithCRLF     1 2 840 113549 1 9 16 1 47 */
      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 9f9636f81897f8856c2ecf173e30c819157e1efd..5b89b7b84aa87aafb9f2165fbe931da886ae3434 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1243,3 +1243,4 @@ ipAddr_asNumberv2         1242
 rpkiManifest           1243
 signedObject           1244
 rpkiNotify             1245
+id_ct_geofeedCSVwithCRLF               1246

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 62bc8c1a8e8aacd3d33fa327dc0e830963e865e3..6fde1ca1161e7c7e86b9e2f59f4f28ac9e065f2e 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -280,6 +280,7 @@ id-smime-ct 27              : id-ct-asciiTextWithCRLF
 id-smime-ct 28         : id-ct-xml
 id-smime-ct 35         : id-ct-rpkiGhostbusters
 id-smime-ct 36         : id-ct-resourceTaggedAttest
+id-smime-ct 47         : id-ct-geofeedCSVwithCRLF
 
 # S/MIME Attributes
 id-smime-aa 1          : id-smime-aa-receiptRequest

diff --git a/fuzz/oids.txt b/fuzz/oids.txt
index cc3f1f14012c1324bc5c8cab53d6dde9294f708b..cec6a7015159b7df5547baa060af48d6b0dcb596 100644 (file)
--- a/fuzz/oids.txt
+++ b/fuzz/oids.txt
@@ -1100,3 +1100,4 @@ OBJ_ipAddr_asNumberv2="\x2B\x06\x01\x05\x05\x07\x0E\x03"
 OBJ_rpkiManifest="\x2B\x06\x01\x05\x05\x07\x30\x0A"
 OBJ_signedObject="\x2B\x06\x01\x05\x05\x07\x30\x0B"
 OBJ_rpkiNotify="\x2B\x06\x01\x05\x05\x07\x30\x0D"
+OBJ_id_ct_geofeedCSVwithCRLF="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x2F"

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 367f72f3c3af7bcf04a97b321e3381ced4cc784a..9e9e3ab22ff1634092e4df30ff7aa63454c65f56 100644 (file)
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -878,6 +878,10 @@
 #define NID_id_ct_resourceTaggedAttest          1237
 #define OBJ_id_ct_resourceTaggedAttest          OBJ_id_smime_ct,36L
 
+#define SN_id_ct_geofeedCSVwithCRLF             "id-ct-geofeedCSVwithCRLF"
+#define NID_id_ct_geofeedCSVwithCRLF            1246
+#define OBJ_id_ct_geofeedCSVwithCRLF            OBJ_id_smime_ct,47L
+
 #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