Objects: Add OIDs needed for CAdES-Processing

Add objects from ETSI-specification(s) used in CAdES processing.
Main document referenced is ETSI EN 319 122-1 V1.2.1.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18655)

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index b75b92a557281b36beef2d3f7c5fa784edc73c26..5ce78310a7ee69d7b0f8fe3c8c237232ef8af990 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[8186] = {
+static const unsigned char so[8316] = {
     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 */
@@ -1128,9 +1128,29 @@ static const unsigned char so[8186] = {
     0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x07,  /* [ 8158] OBJ_id_regCtrl_altCertTemplate */
     0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x0B,  /* [ 8167] OBJ_id_regCtrl_algId */
     0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x0C,  /* [ 8176] OBJ_id_regCtrl_rsaKeyLen */
+    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x2C,  /* [ 8185] OBJ_id_aa_ets_attrCertificateRefs */
+    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x2D,  /* [ 8196] OBJ_id_aa_ets_attrRevocationRefs */
+    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x34,  /* [ 8207] OBJ_id_aa_CMSAlgorithmProtection */
+    0x04,                                          /* [ 8216] OBJ_itu_t_identified_organization */
+    0x04,0x00,                                     /* [ 8217] OBJ_etsi */
+    0x04,0x00,0x8D,0x45,                           /* [ 8219] OBJ_electronic_signature_standard */
+    0x04,0x00,0x8D,0x45,0x02,                      /* [ 8223] OBJ_ess_attributes */
+    0x04,0x00,0x8D,0x45,0x02,0x01,                 /* [ 8228] OBJ_id_aa_ets_mimeType */
+    0x04,0x00,0x8D,0x45,0x02,0x02,                 /* [ 8234] OBJ_id_aa_ets_longTermValidation */
+    0x04,0x00,0x8D,0x45,0x02,0x03,                 /* [ 8240] OBJ_id_aa_ets_SignaturePolicyDocument */
+    0x04,0x00,0x8D,0x45,0x02,0x04,                 /* [ 8246] OBJ_id_aa_ets_archiveTimestampV3 */
+    0x04,0x00,0x8D,0x45,0x02,0x05,                 /* [ 8252] OBJ_id_aa_ATSHashIndex */
+    0x04,0x00,0x81,0x95,0x32,                      /* [ 8258] OBJ_cades */
+    0x04,0x00,0x81,0x95,0x32,0x01,                 /* [ 8263] OBJ_cades_attributes */
+    0x04,0x00,0x81,0x95,0x32,0x01,0x01,            /* [ 8269] OBJ_id_aa_ets_signerAttrV2 */
+    0x04,0x00,0x81,0x95,0x32,0x01,0x03,            /* [ 8276] OBJ_id_aa_ets_sigPolicyStore */
+    0x04,0x00,0x81,0x95,0x32,0x01,0x04,            /* [ 8283] OBJ_id_aa_ATSHashIndex_v2 */
+    0x04,0x00,0x81,0x95,0x32,0x01,0x05,            /* [ 8290] OBJ_id_aa_ATSHashIndex_v3 */
+    0x04,0x00,0x81,0x95,0x32,0x01,0x06,            /* [ 8297] OBJ_signedAssertion */
+    0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x30,  /* [ 8304] OBJ_id_aa_ets_archiveTimestampV2 */
 };
 
-#define NUM_NID 1261
+#define NUM_NID 1281
 static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"UNDEF", "undefined", NID_undef},
     {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@@ -2393,9 +2413,29 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"id-regCtrl-altCertTemplate", "id-regCtrl-altCertTemplate", NID_id_regCtrl_altCertTemplate, 9, &so[8158]},
     {"id-regCtrl-algId", "id-regCtrl-algId", NID_id_regCtrl_algId, 9, &so[8167]},
     {"id-regCtrl-rsaKeyLen", "id-regCtrl-rsaKeyLen", NID_id_regCtrl_rsaKeyLen, 9, &so[8176]},
+    {"id-aa-ets-attrCertificateRefs", "id-aa-ets-attrCertificateRefs", NID_id_aa_ets_attrCertificateRefs, 11, &so[8185]},
+    {"id-aa-ets-attrRevocationRefs", "id-aa-ets-attrRevocationRefs", NID_id_aa_ets_attrRevocationRefs, 11, &so[8196]},
+    {"id-aa-CMSAlgorithmProtection", "id-aa-CMSAlgorithmProtection", NID_id_aa_CMSAlgorithmProtection, 9, &so[8207]},
+    {"itu-t-identified-organization", "itu-t-identified-organization", NID_itu_t_identified_organization, 1, &so[8216]},
+    {"etsi", "etsi", NID_etsi, 2, &so[8217]},
+    {"electronic-signature-standard", "electronic-signature-standard", NID_electronic_signature_standard, 4, &so[8219]},
+    {"ess-attributes", "ess-attributes", NID_ess_attributes, 5, &so[8223]},
+    {"id-aa-ets-mimeType", "id-aa-ets-mimeType", NID_id_aa_ets_mimeType, 6, &so[8228]},
+    {"id-aa-ets-longTermValidation", "id-aa-ets-longTermValidation", NID_id_aa_ets_longTermValidation, 6, &so[8234]},
+    {"id-aa-ets-SignaturePolicyDocument", "id-aa-ets-SignaturePolicyDocument", NID_id_aa_ets_SignaturePolicyDocument, 6, &so[8240]},
+    {"id-aa-ets-archiveTimestampV3", "id-aa-ets-archiveTimestampV3", NID_id_aa_ets_archiveTimestampV3, 6, &so[8246]},
+    {"id-aa-ATSHashIndex", "id-aa-ATSHashIndex", NID_id_aa_ATSHashIndex, 6, &so[8252]},
+    {"cades", "cades", NID_cades, 5, &so[8258]},
+    {"cades-attributes", "cades-attributes", NID_cades_attributes, 6, &so[8263]},
+    {"id-aa-ets-signerAttrV2", "id-aa-ets-signerAttrV2", NID_id_aa_ets_signerAttrV2, 7, &so[8269]},
+    {"id-aa-ets-sigPolicyStore", "id-aa-ets-sigPolicyStore", NID_id_aa_ets_sigPolicyStore, 7, &so[8276]},
+    {"id-aa-ATSHashIndex-v2", "id-aa-ATSHashIndex-v2", NID_id_aa_ATSHashIndex_v2, 7, &so[8283]},
+    {"id-aa-ATSHashIndex-v3", "id-aa-ATSHashIndex-v3", NID_id_aa_ATSHashIndex_v3, 7, &so[8290]},
+    {"signedAssertion", "signedAssertion", NID_signedAssertion, 7, &so[8297]},
+    {"id-aa-ets-archiveTimestampV2", "id-aa-ets-archiveTimestampV2", NID_id_aa_ets_archiveTimestampV2, 11, &so[8304]},
 };
 
-#define NUM_SN 1252
+#define NUM_SN 1272
 static const unsigned int sn_objs[NUM_SN] = {
      364,    /* "AD_DVCS" */
      419,    /* "AES-128-CBC" */
@@ -2767,6 +2807,8 @@ static const unsigned int sn_objs[NUM_SN] = {
      483,    /* "cNAMERecord" */
      179,    /* "caIssuers" */
      785,    /* "caRepository" */
+    1273,    /* "cades" */
+    1274,    /* "cades-attributes" */
     1023,    /* "capwapAC" */
     1024,    /* "capwapWTP" */
      443,    /* "caseIgnoreIA5StringSyntax" */
@@ -2857,10 +2899,13 @@ static const unsigned int sn_objs[NUM_SN] = {
      795,    /* "ecdsa-with-SHA384" */
      796,    /* "ecdsa-with-SHA512" */
      792,    /* "ecdsa-with-Specified" */
+    1266,    /* "electronic-signature-standard" */
       48,    /* "emailAddress" */
      132,    /* "emailProtection" */
      885,    /* "enhancedSearchGuide" */
      389,    /* "enterprises" */
+    1267,    /* "ess-attributes" */
+    1265,    /* "etsi" */
      384,    /* "experimental" */
      172,    /* "extReq" */
       56,    /* "extendedCertificateAttributes" */
@@ -2951,6 +2996,19 @@ static const unsigned int sn_objs[NUM_SN] = {
      852,    /* "id-GostR3411-94-with-GostR3410-94-cc" */
      810,    /* "id-HMACGostR3411-94" */
      782,    /* "id-PasswordBasedMAC" */
+    1272,    /* "id-aa-ATSHashIndex" */
+    1277,    /* "id-aa-ATSHashIndex-v2" */
+    1278,    /* "id-aa-ATSHashIndex-v3" */
+    1263,    /* "id-aa-CMSAlgorithmProtection" */
+    1270,    /* "id-aa-ets-SignaturePolicyDocument" */
+    1280,    /* "id-aa-ets-archiveTimestampV2" */
+    1271,    /* "id-aa-ets-archiveTimestampV3" */
+    1261,    /* "id-aa-ets-attrCertificateRefs" */
+    1262,    /* "id-aa-ets-attrRevocationRefs" */
+    1269,    /* "id-aa-ets-longTermValidation" */
+    1268,    /* "id-aa-ets-mimeType" */
+    1276,    /* "id-aa-ets-sigPolicyStore" */
+    1275,    /* "id-aa-ets-signerAttrV2" */
      266,    /* "id-aca" */
      355,    /* "id-aca-accessIdentity" */
      354,    /* "id-aca-authenticationInfo" */
@@ -3250,6 +3308,7 @@ static const unsigned int sn_objs[NUM_SN] = {
       86,    /* "issuerAltName" */
     1008,    /* "issuerSignTool" */
      770,    /* "issuingDistributionPoint" */
+    1264,    /* "itu-t-identified-organization" */
      492,    /* "janetMailbox" */
      957,    /* "jurisdictionC" */
      955,    /* "jurisdictionL" */
@@ -3583,6 +3642,7 @@ static const unsigned int sn_objs[NUM_SN] = {
      604,    /* "setext-pinAny" */
      603,    /* "setext-pinSecure" */
      605,    /* "setext-track2" */
+    1279,    /* "signedAssertion" */
     1244,    /* "signedObject" */
       52,    /* "signingTime" */
      454,    /* "simpleSecurityObject" */
@@ -3651,7 +3711,7 @@ static const unsigned int sn_objs[NUM_SN] = {
     1093,    /* "x509ExtAdmission" */
 };
 
-#define NUM_LN 1252
+#define NUM_LN 1272
 static const unsigned int ln_objs[NUM_LN] = {
      363,    /* "AD Time Stamping" */
      405,    /* "ANSI X9.62" */
@@ -4014,6 +4074,8 @@ static const unsigned int ln_objs[NUM_LN] = {
      703,    /* "c2tnb431r1" */
      881,    /* "cACertificate" */
      483,    /* "cNAMERecord" */
+    1273,    /* "cades" */
+    1274,    /* "cades-attributes" */
      751,    /* "camellia-128-cbc" */
      962,    /* "camellia-128-ccm" */
      757,    /* "camellia-128-cfb" */
@@ -4152,9 +4214,12 @@ static const unsigned int ln_objs[NUM_LN] = {
     1113,    /* "ecdsa_with_SHA3-256" */
     1114,    /* "ecdsa_with_SHA3-384" */
     1115,    /* "ecdsa_with_SHA3-512" */
+    1266,    /* "electronic-signature-standard" */
       48,    /* "emailAddress" */
      632,    /* "encrypted track 2" */
      885,    /* "enhancedSearchGuide" */
+    1267,    /* "ess-attributes" */
+    1265,    /* "etsi" */
       56,    /* "extendedCertificateAttributes" */
      867,    /* "facsimileTelephoneNumber" */
      462,    /* "favouriteDrink" */
@@ -4229,6 +4294,19 @@ static const unsigned int ln_objs[NUM_LN] = {
      848,    /* "id-GostR3410-94-bBis" */
      822,    /* "id-GostR3411-94-CryptoProParamSet" */
      821,    /* "id-GostR3411-94-TestParamSet" */
+    1272,    /* "id-aa-ATSHashIndex" */
+    1277,    /* "id-aa-ATSHashIndex-v2" */
+    1278,    /* "id-aa-ATSHashIndex-v3" */
+    1263,    /* "id-aa-CMSAlgorithmProtection" */
+    1270,    /* "id-aa-ets-SignaturePolicyDocument" */
+    1280,    /* "id-aa-ets-archiveTimestampV2" */
+    1271,    /* "id-aa-ets-archiveTimestampV3" */
+    1261,    /* "id-aa-ets-attrCertificateRefs" */
+    1262,    /* "id-aa-ets-attrRevocationRefs" */
+    1269,    /* "id-aa-ets-longTermValidation" */
+    1268,    /* "id-aa-ets-mimeType" */
+    1276,    /* "id-aa-ets-sigPolicyStore" */
+    1275,    /* "id-aa-ets-signerAttrV2" */
      266,    /* "id-aca" */
      355,    /* "id-aca-accessIdentity" */
      354,    /* "id-aca-authenticationInfo" */
@@ -4476,6 +4554,7 @@ static const unsigned int ln_objs[NUM_LN] = {
      181,    /* "iso" */
      623,    /* "issuer capabilities" */
      645,    /* "itu-t" */
+    1264,    /* "itu-t-identified-organization" */
      492,    /* "janetMailbox" */
      646,    /* "joint-iso-itu-t" */
      957,    /* "jurisdictionCountryName" */
@@ -4838,6 +4917,7 @@ static const unsigned int ln_objs[NUM_LN] = {
       42,    /* "shaWithRSAEncryption" */
     1100,    /* "shake128" */
     1101,    /* "shake256" */
+    1279,    /* "signedAssertion" */
       52,    /* "signingTime" */
      454,    /* "simpleSecurityObject" */
      496,    /* "singleLevelQuality" */
@@ -4907,7 +4987,7 @@ static const unsigned int ln_objs[NUM_LN] = {
      125,    /* "zlib compression" */
 };
 
-#define NUM_OBJ 1123
+#define NUM_OBJ 1143
 static const unsigned int obj_objs[NUM_OBJ] = {
        0,    /* OBJ_undef                        0 */
      181,    /* OBJ_iso                          1 */
@@ -4915,12 +4995,14 @@ static const unsigned int obj_objs[NUM_OBJ] = {
      404,    /* OBJ_ccitt                        OBJ_itu_t */
      645,    /* OBJ_itu_t                        0 */
      646,    /* OBJ_joint_iso_itu_t              2 */
+    1264,    /* OBJ_itu_t_identified_organization 0 4 */
      434,    /* OBJ_data                         0 9 */
      182,    /* OBJ_member_body                  1 2 */
      379,    /* OBJ_org                          1 3 */
      676,    /* OBJ_identified_organization      1 3 */
       11,    /* OBJ_X500                         2 5 */
      647,    /* OBJ_international_organizations  2 23 */
+    1265,    /* OBJ_etsi                         0 4 0 */
      380,    /* OBJ_dod                          1 3 6 */
     1170,    /* OBJ_ieee                         1 3 111 */
       12,    /* OBJ_X509                         2 5 4 */
@@ -5029,6 +5111,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
      517,    /* OBJ_set_certExt                  2 23 42 7 */
      518,    /* OBJ_set_brand                    2 23 42 8 */
      679,    /* OBJ_wap_wsg                      2 23 43 1 */
+    1266,    /* OBJ_electronic_signature_standard 0 4 0 1733 */
      382,    /* OBJ_Directory                    1 3 6 1 1 */
      383,    /* OBJ_Management                   1 3 6 1 2 */
      384,    /* OBJ_Experimental                 1 3 6 1 3 */
@@ -5154,6 +5237,8 @@ static const unsigned int obj_objs[NUM_OBJ] = {
      637,    /* OBJ_set_brand_Diners             2 23 42 8 30 */
      638,    /* OBJ_set_brand_AmericanExpress    2 23 42 8 34 */
      639,    /* OBJ_set_brand_JCB                2 23 42 8 35 */
+    1273,    /* OBJ_cades                        0 4 0 19122 */
+    1267,    /* OBJ_ess_attributes               0 4 0 1733 2 */
     1195,    /* OBJ_gmac                         1 0 9797 3 4 */
     1141,    /* OBJ_oscca                        1 2 156 10197 */
      805,    /* OBJ_cryptopro                    1 2 643 2 2 */
@@ -5237,6 +5322,12 @@ static const unsigned int obj_objs[NUM_OBJ] = {
      743,    /* OBJ_wap_wsg_idm_ecid_wtls10      2 23 43 1 4 10 */
      744,    /* OBJ_wap_wsg_idm_ecid_wtls11      2 23 43 1 4 11 */
      745,    /* OBJ_wap_wsg_idm_ecid_wtls12      2 23 43 1 4 12 */
+    1274,    /* OBJ_cades_attributes             0 4 0 19122 1 */
+    1268,    /* OBJ_id_aa_ets_mimeType           0 4 0 1733 2 1 */
+    1269,    /* OBJ_id_aa_ets_longTermValidation 0 4 0 1733 2 2 */
+    1270,    /* OBJ_id_aa_ets_SignaturePolicyDocument 0 4 0 1733 2 3 */
+    1271,    /* OBJ_id_aa_ets_archiveTimestampV3 0 4 0 1733 2 4 */
+    1272,    /* OBJ_id_aa_ATSHashIndex           0 4 0 1733 2 5 */
      804,    /* OBJ_whirlpool                    1 0 10118 3 0 55 */
     1142,    /* OBJ_sm_scheme                    1 2 156 10197 1 */
      773,    /* OBJ_kisa                         1 2 410 200004 */
@@ -5279,6 +5370,11 @@ static const unsigned int obj_objs[NUM_OBJ] = {
      633,    /* OBJ_setAttr_T2cleartxt           2 23 42 3 3 4 2 */
      634,    /* OBJ_setAttr_TokICCsig            2 23 42 3 3 5 1 */
      635,    /* OBJ_setAttr_SecDevSig            2 23 42 3 3 5 2 */
+    1275,    /* OBJ_id_aa_ets_signerAttrV2       0 4 0 19122 1 1 */
+    1276,    /* OBJ_id_aa_ets_sigPolicyStore     0 4 0 19122 1 3 */
+    1277,    /* OBJ_id_aa_ATSHashIndex_v2        0 4 0 19122 1 4 */
+    1278,    /* OBJ_id_aa_ATSHashIndex_v3        0 4 0 19122 1 5 */
+    1279,    /* OBJ_signedAssertion              0 4 0 19122 1 6 */
      436,    /* OBJ_ucl                          0 9 2342 19200300 */
      820,    /* OBJ_id_Gost28147_89_None_KeyMeshing 1 2 643 2 2 14 0 */
      819,    /* OBJ_id_Gost28147_89_CryptoPro_KeyMeshing 1 2 643 2 2 14 1 */
@@ -5712,6 +5808,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
      188,    /* OBJ_SMIME                        1 2 840 113549 1 9 16 */
      156,    /* OBJ_friendlyName                 1 2 840 113549 1 9 20 */
      157,    /* OBJ_localKeyID                   1 2 840 113549 1 9 21 */
+    1263,    /* OBJ_id_aa_CMSAlgorithmProtection 1 2 840 113549 1 9 52 */
      681,    /* OBJ_X9_62_onBasis                1 2 840 10045 1 2 3 1 */
      682,    /* OBJ_X9_62_tpBasis                1 2 840 10045 1 2 3 2 */
      683,    /* OBJ_X9_62_ppBasis                1 2 840 10045 1 2 3 3 */
@@ -5990,7 +6087,10 @@ static const unsigned int obj_objs[NUM_OBJ] = {
      238,    /* OBJ_id_smime_aa_ets_archiveTimeStamp 1 2 840 113549 1 9 16 2 27 */
      239,    /* OBJ_id_smime_aa_signatureType    1 2 840 113549 1 9 16 2 28 */
      240,    /* OBJ_id_smime_aa_dvcs_dvc         1 2 840 113549 1 9 16 2 29 */
+    1261,    /* OBJ_id_aa_ets_attrCertificateRefs 1 2 840 113549 1 9 16 2 44 */
+    1262,    /* OBJ_id_aa_ets_attrRevocationRefs 1 2 840 113549 1 9 16 2 45 */
     1086,    /* OBJ_id_smime_aa_signingCertificateV2 1 2 840 113549 1 9 16 2 47 */
+    1280,    /* OBJ_id_aa_ets_archiveTimestampV2 1 2 840 113549 1 9 16 2 48 */
      241,    /* OBJ_id_smime_alg_ESDHwith3DES    1 2 840 113549 1 9 16 3 1 */
      242,    /* OBJ_id_smime_alg_ESDHwithRC2     1 2 840 113549 1 9 16 3 2 */
      243,    /* OBJ_id_smime_alg_3DESwrap        1 2 840 113549 1 9 16 3 3 */

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index d9a2ba7d29df5d28716c2937257e80c7240dac49..f64d7bbfa84ec30744651803d7de20132b099797 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1258,3 +1258,23 @@ id_it_crls               1257
 id_regCtrl_altCertTemplate             1258
 id_regCtrl_algId               1259
 id_regCtrl_rsaKeyLen           1260
+id_aa_ets_attrCertificateRefs          1261
+id_aa_ets_attrRevocationRefs           1262
+id_aa_CMSAlgorithmProtection           1263
+itu_t_identified_organization          1264
+etsi           1265
+electronic_signature_standard          1266
+ess_attributes         1267
+id_aa_ets_mimeType             1268
+id_aa_ets_longTermValidation           1269
+id_aa_ets_SignaturePolicyDocument              1270
+id_aa_ets_archiveTimestampV3           1271
+id_aa_ATSHashIndex             1272
+cades          1273
+cades_attributes               1274
+id_aa_ets_signerAttrV2         1275
+id_aa_ets_sigPolicyStore               1276
+id_aa_ATSHashIndex_v2          1277
+id_aa_ATSHashIndex_v3          1278
+signedAssertion                1279
+id_aa_ets_archiveTimestampV2           1280

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index c47d0c7235b8b6563fbc75cbe049e79a67261678..58f00cf9a4a14494a37d1bb4f4f8ede0becbbca4 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -316,7 +316,10 @@ id-smime-aa 26             : id-smime-aa-ets-certCRLTimestamp
 id-smime-aa 27         : id-smime-aa-ets-archiveTimeStamp
 id-smime-aa 28         : id-smime-aa-signatureType
 id-smime-aa 29         : id-smime-aa-dvcs-dvc
+id-smime-aa 44         : id-aa-ets-attrCertificateRefs
+id-smime-aa 45         : id-aa-ets-attrRevocationRefs
 id-smime-aa 47         : id-smime-aa-signingCertificateV2
+id-smime-aa 48         : id-aa-ets-archiveTimestampV2
 
 # S/MIME Algorithm Identifiers
 # obsolete
@@ -358,6 +361,8 @@ certTypes 2         :                       : sdsiCertificate
 !Alias crlTypes pkcs9 23
 crlTypes 1             :                       : x509Crl
 
+pkcs9 52               : id-aa-CMSAlgorithmProtection
+
 !Alias pkcs12 pkcs 12
 !Alias pkcs12-pbeids pkcs12 1
 
@@ -1064,6 +1069,27 @@ holdInstruction 3        : holdInstructionReject : Hold Instruction Reject
 
 # OID's from ITU-T.  Most of this is defined in RFC 1274.  A couple of
 # them are also mentioned in RFC 2247
+# OIDs specific to Electronic Signature Standard/CAdES are as specified in
+# ETSI EN 319 122-1 V1.2.1 (2021-10):
+# Electronic Signatures and Infrastructures (ESI); CAdES digital signatures; 
+# Part 1: Building blocks and CAdES baseline signatures
+itu-t 4                        : itu-t-identified-organization
+itu-t-identified-organization 0: etsi
+etsi 1733              : electronic-signature-standard
+electronic-signature-standard 2: ess-attributes
+ess-attributes 1       : id-aa-ets-mimeType
+ess-attributes 2       : id-aa-ets-longTermValidation
+ess-attributes 3       : id-aa-ets-SignaturePolicyDocument
+ess-attributes 4       : id-aa-ets-archiveTimestampV3
+ess-attributes 5       : id-aa-ATSHashIndex
+etsi 19122             : cades
+cades 1                        : cades-attributes
+cades-attributes 1     : id-aa-ets-signerAttrV2
+cades-attributes 3     : id-aa-ets-sigPolicyStore
+cades-attributes 4     : id-aa-ATSHashIndex-v2
+cades-attributes 5     : id-aa-ATSHashIndex-v3
+cades-attributes 6     : signedAssertion
+
 itu-t 9                        : data
 data 2342              : pss
 pss 19200300           : ucl

diff --git a/fuzz/oids.txt b/fuzz/oids.txt
index 5d0aa6e22aa535ca853ada3a79e658daa81bca15..0d43eaf67d0a7d0a9d867d80168d49bce009395c 100644 (file)
--- a/fuzz/oids.txt
+++ b/fuzz/oids.txt
@@ -1124,3 +1124,23 @@ OBJ_id_it_crls="\x2B\x06\x01\x05\x05\x07\x04\x17"
 OBJ_id_regCtrl_altCertTemplate="\x2B\x06\x01\x05\x05\x07\x05\x01\x07"
 OBJ_id_regCtrl_algId="\x2B\x06\x01\x05\x05\x07\x05\x01\x0B"
 OBJ_id_regCtrl_rsaKeyLen="\x2B\x06\x01\x05\x05\x07\x05\x01\x0C"
+OBJ_id_aa_ets_attrCertificateRefs="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x02\x2C"
+OBJ_id_aa_ets_attrRevocationRefs="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x02\x2D"
+OBJ_id_aa_CMSAlgorithmProtection="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x34"
+OBJ_itu_t_identified_organization="\x04"
+OBJ_etsi="\x04\x00"
+OBJ_electronic_signature_standard="\x04\x00\x8D\x45"
+OBJ_ess_attributes="\x04\x00\x8D\x45\x02"
+OBJ_id_aa_ets_mimeType="\x04\x00\x8D\x45\x02\x01"
+OBJ_id_aa_ets_longTermValidation="\x04\x00\x8D\x45\x02\x02"
+OBJ_id_aa_ets_SignaturePolicyDocument="\x04\x00\x8D\x45\x02\x03"
+OBJ_id_aa_ets_archiveTimestampV3="\x04\x00\x8D\x45\x02\x04"
+OBJ_id_aa_ATSHashIndex="\x04\x00\x8D\x45\x02\x05"
+OBJ_cades="\x04\x00\x81\x95\x32"
+OBJ_cades_attributes="\x04\x00\x81\x95\x32\x01"
+OBJ_id_aa_ets_signerAttrV2="\x04\x00\x81\x95\x32\x01\x01"
+OBJ_id_aa_ets_sigPolicyStore="\x04\x00\x81\x95\x32\x01\x03"
+OBJ_id_aa_ATSHashIndex_v2="\x04\x00\x81\x95\x32\x01\x04"
+OBJ_id_aa_ATSHashIndex_v3="\x04\x00\x81\x95\x32\x01\x05"
+OBJ_signedAssertion="\x04\x00\x81\x95\x32\x01\x06"
+OBJ_id_aa_ets_archiveTimestampV2="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x02\x30"

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 81f47ec2391a1dc96365118931f8785c8d3b8782..1e678ead22bdf9424bbb452c416af18c60a717a1 100644 (file)
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -1006,10 +1006,22 @@
 #define NID_id_smime_aa_dvcs_dvc                240
 #define OBJ_id_smime_aa_dvcs_dvc                OBJ_id_smime_aa,29L
 
+#define SN_id_aa_ets_attrCertificateRefs                "id-aa-ets-attrCertificateRefs"
+#define NID_id_aa_ets_attrCertificateRefs               1261
+#define OBJ_id_aa_ets_attrCertificateRefs               OBJ_id_smime_aa,44L
+
+#define SN_id_aa_ets_attrRevocationRefs         "id-aa-ets-attrRevocationRefs"
+#define NID_id_aa_ets_attrRevocationRefs                1262
+#define OBJ_id_aa_ets_attrRevocationRefs                OBJ_id_smime_aa,45L
+
 #define SN_id_smime_aa_signingCertificateV2             "id-smime-aa-signingCertificateV2"
 #define NID_id_smime_aa_signingCertificateV2            1086
 #define OBJ_id_smime_aa_signingCertificateV2            OBJ_id_smime_aa,47L
 
+#define SN_id_aa_ets_archiveTimestampV2         "id-aa-ets-archiveTimestampV2"
+#define NID_id_aa_ets_archiveTimestampV2                1280
+#define OBJ_id_aa_ets_archiveTimestampV2                OBJ_id_smime_aa,48L
+
 #define SN_id_smime_alg_ESDHwith3DES            "id-smime-alg-ESDHwith3DES"
 #define NID_id_smime_alg_ESDHwith3DES           241
 #define OBJ_id_smime_alg_ESDHwith3DES           OBJ_id_smime_alg,1L
@@ -1112,6 +1124,10 @@
 #define NID_x509Crl             160
 #define OBJ_x509Crl             OBJ_crlTypes,1L
 
+#define SN_id_aa_CMSAlgorithmProtection         "id-aa-CMSAlgorithmProtection"
+#define NID_id_aa_CMSAlgorithmProtection                1263
+#define OBJ_id_aa_CMSAlgorithmProtection                OBJ_pkcs9,52L
+
 #define OBJ_pkcs12              OBJ_pkcs,12L
 
 #define OBJ_pkcs12_pbeids               OBJ_pkcs12,1L
@@ -3264,6 +3280,70 @@
 #define NID_hold_instruction_reject             433
 #define OBJ_hold_instruction_reject             OBJ_holdInstruction,3L
 
+#define SN_itu_t_identified_organization                "itu-t-identified-organization"
+#define NID_itu_t_identified_organization               1264
+#define OBJ_itu_t_identified_organization               OBJ_itu_t,4L
+
+#define SN_etsi         "etsi"
+#define NID_etsi                1265
+#define OBJ_etsi                OBJ_itu_t_identified_organization,0L
+
+#define SN_electronic_signature_standard                "electronic-signature-standard"
+#define NID_electronic_signature_standard               1266
+#define OBJ_electronic_signature_standard               OBJ_etsi,1733L
+
+#define SN_ess_attributes               "ess-attributes"
+#define NID_ess_attributes              1267
+#define OBJ_ess_attributes              OBJ_electronic_signature_standard,2L
+
+#define SN_id_aa_ets_mimeType           "id-aa-ets-mimeType"
+#define NID_id_aa_ets_mimeType          1268
+#define OBJ_id_aa_ets_mimeType          OBJ_ess_attributes,1L
+
+#define SN_id_aa_ets_longTermValidation         "id-aa-ets-longTermValidation"
+#define NID_id_aa_ets_longTermValidation                1269
+#define OBJ_id_aa_ets_longTermValidation                OBJ_ess_attributes,2L
+
+#define SN_id_aa_ets_SignaturePolicyDocument            "id-aa-ets-SignaturePolicyDocument"
+#define NID_id_aa_ets_SignaturePolicyDocument           1270
+#define OBJ_id_aa_ets_SignaturePolicyDocument           OBJ_ess_attributes,3L
+
+#define SN_id_aa_ets_archiveTimestampV3         "id-aa-ets-archiveTimestampV3"
+#define NID_id_aa_ets_archiveTimestampV3                1271
+#define OBJ_id_aa_ets_archiveTimestampV3                OBJ_ess_attributes,4L
+
+#define SN_id_aa_ATSHashIndex           "id-aa-ATSHashIndex"
+#define NID_id_aa_ATSHashIndex          1272
+#define OBJ_id_aa_ATSHashIndex          OBJ_ess_attributes,5L
+
+#define SN_cades                "cades"
+#define NID_cades               1273
+#define OBJ_cades               OBJ_etsi,19122L
+
+#define SN_cades_attributes             "cades-attributes"
+#define NID_cades_attributes            1274
+#define OBJ_cades_attributes            OBJ_cades,1L
+
+#define SN_id_aa_ets_signerAttrV2               "id-aa-ets-signerAttrV2"
+#define NID_id_aa_ets_signerAttrV2              1275
+#define OBJ_id_aa_ets_signerAttrV2              OBJ_cades_attributes,1L
+
+#define SN_id_aa_ets_sigPolicyStore             "id-aa-ets-sigPolicyStore"
+#define NID_id_aa_ets_sigPolicyStore            1276
+#define OBJ_id_aa_ets_sigPolicyStore            OBJ_cades_attributes,3L
+
+#define SN_id_aa_ATSHashIndex_v2                "id-aa-ATSHashIndex-v2"
+#define NID_id_aa_ATSHashIndex_v2               1277
+#define OBJ_id_aa_ATSHashIndex_v2               OBJ_cades_attributes,4L
+
+#define SN_id_aa_ATSHashIndex_v3                "id-aa-ATSHashIndex-v3"
+#define NID_id_aa_ATSHashIndex_v3               1278
+#define OBJ_id_aa_ATSHashIndex_v3               OBJ_cades_attributes,5L
+
+#define SN_signedAssertion              "signedAssertion"
+#define NID_signedAssertion             1279
+#define OBJ_signedAssertion             OBJ_cades_attributes,6L
+
 #define SN_data         "data"
 #define NID_data                434
 #define OBJ_data                OBJ_itu_t,9L