Browse Source

Add OID for RPKI id-ct-signedChecklist

References: draft-ietf-sidrops-rpki-rsc - Resource Public Key Infrastructure
(RPKI) object profile for Signed Checklist (RSC)

OID listed 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: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15207)
master
Job Snijders 5 months ago
committed by Pauli
parent
commit
7303c58217
5 changed files with 17 additions and 5 deletions
  1. +10
    -5
      crypto/objects/obj_dat.h
  2. +1
    -0
      crypto/objects/obj_mac.num
  3. +1
    -0
      crypto/objects/objects.txt
  4. +1
    -0
      fuzz/oids.txt
  5. +4
    -0
      include/openssl/obj_mac.h

+ 10
- 5
crypto/objects/obj_dat.h View File

@ -10,7 +10,7 @@
*/
/* Serialized OID's */
static const unsigned char so[8065] = {
static const unsigned char so[8076] = {
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 */
@ -1114,9 +1114,10 @@ static const unsigned char so[8065] = {
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 */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x30, /* [ 8064] OBJ_id_ct_signedChecklist */
};
#define NUM_NID 1247
#define NUM_NID 1248
static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"UNDEF", "undefined", NID_undef},
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@ -2365,9 +2366,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"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]},
{"id-ct-signedChecklist", "id-ct-signedChecklist", NID_id_ct_signedChecklist, 11, &so[8064]},
};
#define NUM_SN 1238
#define NUM_SN 1239
static const unsigned int sn_objs[NUM_SN] = {
364, /* "AD_DVCS" */
419, /* "AES-128-CBC" */
@ -2984,6 +2986,7 @@ static const unsigned int sn_objs[NUM_SN] = {
1234, /* "id-ct-routeOriginAuthz" */
1236, /* "id-ct-rpkiGhostbusters" */
1235, /* "id-ct-rpkiManifest" */
1247, /* "id-ct-signedChecklist" */
1060, /* "id-ct-xml" */
1108, /* "id-dsa-with-sha3-224" */
1109, /* "id-dsa-with-sha3-256" */
@ -3609,7 +3612,7 @@ static const unsigned int sn_objs[NUM_SN] = {
1093, /* "x509ExtAdmission" */
};
#define NUM_LN 1238
#define NUM_LN 1239
static const unsigned int ln_objs[NUM_LN] = {
363, /* "AD Time Stamping" */
405, /* "ANSI X9.62" */
@ -4244,6 +4247,7 @@ static const unsigned int ln_objs[NUM_LN] = {
1234, /* "id-ct-routeOriginAuthz" */
1236, /* "id-ct-rpkiGhostbusters" */
1235, /* "id-ct-rpkiManifest" */
1247, /* "id-ct-signedChecklist" */
1060, /* "id-ct-xml" */
408, /* "id-ecPublicKey" */
508, /* "id-hex-multipart-message" */
@ -4851,7 +4855,7 @@ static const unsigned int ln_objs[NUM_LN] = {
125, /* "zlib compression" */
};
#define NUM_OBJ 1109
#define NUM_OBJ 1110
static const unsigned int obj_objs[NUM_OBJ] = {
0, /* OBJ_undef 0 */
181, /* OBJ_iso 1 */
@ -5891,6 +5895,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
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 */
1247, /* OBJ_id_ct_signedChecklist 1 2 840 113549 1 9 16 1 48 */
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 */


+ 1
- 0
crypto/objects/obj_mac.num View File

@ -1244,3 +1244,4 @@ rpkiManifest 1243
signedObject 1244
rpkiNotify 1245
id_ct_geofeedCSVwithCRLF 1246
id_ct_signedChecklist 1247

+ 1
- 0
crypto/objects/objects.txt View File

@ -281,6 +281,7 @@ 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
id-smime-ct 48 : id-ct-signedChecklist
# S/MIME Attributes
id-smime-aa 1 : id-smime-aa-receiptRequest


+ 1
- 0
fuzz/oids.txt View File

@ -1110,3 +1110,4 @@ 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"
OBJ_id_ct_signedChecklist="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x30"

+ 4
- 0
include/openssl/obj_mac.h View File

@ -882,6 +882,10 @@
#define NID_id_ct_geofeedCSVwithCRLF 1246
#define OBJ_id_ct_geofeedCSVwithCRLF OBJ_id_smime_ct,47L
#define SN_id_ct_signedChecklist "id-ct-signedChecklist"
#define NID_id_ct_signedChecklist 1247
#define OBJ_id_ct_signedChecklist OBJ_id_smime_ct,48L
#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


Loading…
Cancel
Save