summaryrefslogtreecommitdiffstats
path: root/crypto/objects/obj_mac.num
diff options
context:
space:
mode:
authorGraham Woodward <graham.woodward@ibm.com>2022-08-19 08:46:47 +0100
committerMatt Caswell <matt@openssl.org>2022-09-23 17:40:02 +0100
commite869c867c1c405de3b6538586f17b67937556a4b (patch)
tree21feab85e639e54c1e2a8a6d1a68a807f2e7dae4 /crypto/objects/obj_mac.num
parentecc920b3277311e859282b6d400ba8566d7ea8c1 (diff)
Allow PKCS12 export to set arbitrary bag attributes
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19025)
Diffstat (limited to 'crypto/objects/obj_mac.num')
-rw-r--r--crypto/objects/obj_mac.num2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 0a92288d1c..e56d96336c 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1279,3 +1279,5 @@ id_aa_ATSHashIndex_v3 1278
signedAssertion 1279
id_aa_ets_archiveTimestampV2 1280
hmacWithSM3 1281
+oracle 1282
+oracle_jdk_trustedkeyusage 1283