openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Add OID for RPKI id-ct-ASPA 

References: draft-ietf-sidrops-aspa-profile
"A Profile for Autonomous System Provider Authorization" (ASPA)

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: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17002)
This commit is contained in:
Job Snijders 2021-11-09 19:30:28 +00:00 committed by Tomas Mraz
parent 8f9842fd03
commit b0c1214e1e
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/objects/obj_dat.h
View File

@ -10,7 +10,7 @@
*/
/* Serialized OID's */
static const unsigned char so[8092] = {
static const unsigned char so[8103] = {
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 */
@ -1117,9 +1117,10 @@ static const unsigned char so[8092] = {
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x30, /* [ 8064] OBJ_id_ct_signedChecklist */
0x2A,0x81,0x1C,0xCF,0x55,0x01,0x68,0x08, /* [ 8075] OBJ_sm4_gcm */
0x2A,0x81,0x1C,0xCF,0x55,0x01,0x68,0x09, /* [ 8083] OBJ_sm4_ccm */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x31, /* [ 8091] OBJ_id_ct_ASPA */
};
#define NUM_NID 1250
#define NUM_NID 1251
static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"UNDEF", "undefined", NID_undef},
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@ -2371,9 +2372,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"id-ct-signedChecklist", "id-ct-signedChecklist", NID_id_ct_signedChecklist, 11, &so[8064]},
{"SM4-GCM", "sm4-gcm", NID_sm4_gcm, 8, &so[8075]},
{"SM4-CCM", "sm4-ccm", NID_sm4_ccm, 8, &so[8083]},
{"id-ct-ASPA", "id-ct-ASPA", NID_id_ct_ASPA, 11, &so[8091]},
};
#define NUM_SN 1241
#define NUM_SN 1242
static const unsigned int sn_objs[NUM_SN] = {
364, /* "AD_DVCS" */
419, /* "AES-128-CBC" */
@ -2986,6 +2988,7 @@ static const unsigned int sn_objs[NUM_SN] = {
327, /* "id-cmc-statusInfo" */
331, /* "id-cmc-transactionId" */
1238, /* "id-cp" */
1250, /* "id-ct-ASPA" */
787, /* "id-ct-asciiTextWithCRLF" */
1246, /* "id-ct-geofeedCSVwithCRLF" */
1237, /* "id-ct-resourceTaggedAttest" */
@ -3618,7 +3621,7 @@ static const unsigned int sn_objs[NUM_SN] = {
1093, /* "x509ExtAdmission" */
};
#define NUM_LN 1241
#define NUM_LN 1242
static const unsigned int ln_objs[NUM_LN] = {
363, /* "AD Time Stamping" */
405, /* "ANSI X9.62" */
@ -4247,6 +4250,7 @@ static const unsigned int ln_objs[NUM_LN] = {
327, /* "id-cmc-statusInfo" */
331, /* "id-cmc-transactionId" */
1238, /* "id-cp" */
1250, /* "id-ct-ASPA" */
787, /* "id-ct-asciiTextWithCRLF" */
1246, /* "id-ct-geofeedCSVwithCRLF" */
1237, /* "id-ct-resourceTaggedAttest" */
@ -4863,7 +4867,7 @@ static const unsigned int ln_objs[NUM_LN] = {
125, /* "zlib compression" */
};
#define NUM_OBJ 1112
#define NUM_OBJ 1113
static const unsigned int obj_objs[NUM_OBJ] = {
0, /* OBJ_undef 0 */
181, /* OBJ_iso 1 */
@ -5906,6 +5910,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
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 */
1250, /* OBJ_id_ct_ASPA 1 2 840 113549 1 9 16 1 49 */
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
crypto/objects/obj_mac.num
View File

@ -1247,3 +1247,4 @@ id_ct_geofeedCSVwithCRLF 1246
id_ct_signedChecklist 1247
sm4_gcm 1248
sm4_ccm 1249
id_ct_ASPA 1250

1
crypto/objects/objects.txt
View File

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

1
fuzz/oids.txt
View File

@ -1113,3 +1113,4 @@ 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"
OBJ_sm4_gcm="\x2A\x81\x1C\xCF\x55\x01\x68\x08"
OBJ_sm4_ccm="\x2A\x81\x1C\xCF\x55\x01\x68\x09"
OBJ_id_ct_ASPA="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x01\x31"

4
include/openssl/obj_mac.h
View File

@ -886,6 +886,10 @@
#define NID_id_ct_signedChecklist 1247
#define OBJ_id_ct_signedChecklist OBJ_id_smime_ct,48L
#define SN_id_ct_ASPA "id-ct-ASPA"
#define NID_id_ct_ASPA 1250
#define OBJ_id_ct_ASPA OBJ_id_smime_ct,49L
#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