Commit 377d369904 for openssl.org

commit 377d369904609d1344142c1fa446c561a029445c
Author: Dmitry Belyavskiy <beldmit@gmail.com>
Date:   Wed Apr 15 16:17:33 2026 +0200

    Add id-aes OID to OpenSSL object database

    This is the base AES OID used by Java keytool when storing generic
    AES symmetric keys in PKCS#12 files.

    Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
    Reviewed-by: Simo Sorce <simo@redhat.com>
    MergeDate: Thu Sep 24 07:34:21 2026
    (Merged from https://github.com/openssl/openssl/pull/30937)

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 327519580c..e7aad1b1f7 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1501,3 +1501,4 @@ id_smime_ori_kem		1500
 id_alg_hss_lms_hashsig		1501
 id_rdna_unsigned		1502
 id_alg_unsigned		1503
+id_aes		1504
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index b9d627e074..ac1510bff4 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1026,6 +1026,9 @@ id-smime-alg 8		: ZLIB			: zlib compression
 !Alias nistAlgorithms csor 4
 !Alias aes nistAlgorithms 1

+# Base AES OID (used by Java keytool for generic AES keys)
+nistAlgorithms 1	: id-aes
+
 aes 1			: AES-128-ECB		: aes-128-ecb
 aes 2			: AES-128-CBC		: aes-128-cbc
 !Cname aes-128-ofb128
diff --git a/fuzz/oids.txt b/fuzz/oids.txt
index f4c1979113..d1b43a7dc8 100644
--- a/fuzz/oids.txt
+++ b/fuzz/oids.txt
@@ -1352,3 +1352,4 @@ OBJ_id_smime_ori_kem="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x0D\x03"
 OBJ_id_alg_hss_lms_hashsig="\x2A\x86\x48\x86\xF7\x0D\x01\x09\x10\x03\x11"
 OBJ_id_rdna_unsigned="\x2B\x06\x01\x05\x05\x07\x19\x01"
 OBJ_id_alg_unsigned="\x2B\x06\x01\x05\x05\x07\x06\x24"
+OBJ_id_aes="\x60\x86\x48\x01\x65\x03\x04\x01"