Commit cbe895db7c for openssl.org
commit cbe895db7c0759028eee99e01c5e4666be069dbe
Author: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Fri Oct 2 16:26:07 2026 +0200
Add multi-key derivation purpose strings and size parameters
Add constants to paramnames.pm for EVP_KDF_derive_SKEYs:
Size parameters for derive_multi:
OSSL_KDF_PARAM_MAC_KEY_LEN, CIPHER_KEY_LEN, IV_LEN
TLS 1.2 purpose strings:
client_MAC_key, server_MAC_key, client_cipher_key,
server_cipher_key, client_IV, server_IV
TLS 1.3 purpose strings:
client_key, server_key, client_iv, server_iv
These are used by providers to map purpose names to derived key
material in the multi-key derivation API.
Assisted-By: Claude Opus 4.6 <noreply@anthropic.com>
Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
Reviewed-by: Simo Sorce <simo@redhat.com>
MergeDate: Wed Nov 18 12:11:48 2026
(Merged from https://github.com/openssl/openssl/pull/33082)
diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
index 5ea5a6244d..df4fcdcfc2 100644
--- a/util/perl/OpenSSL/paramnames.pm
+++ b/util/perl/OpenSSL/paramnames.pm
@@ -272,6 +272,23 @@ my %params = (
'OSSL_KDF_PARAM_FIPS_KEY_CHECK' => '*OSSL_PKEY_PARAM_FIPS_KEY_CHECK',
'OSSL_KDF_PARAM_FIPS_APPROVED_INDICATOR' => '*OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR',
+# Multi-key derivation parameters
+ 'OSSL_KDF_PARAM_MAC_KEY_LEN' => "mac_key_len", # size_t
+ 'OSSL_KDF_PARAM_CIPHER_KEY_LEN' => "cipher_key_len", # size_t
+ 'OSSL_KDF_PARAM_IV_LEN' => "iv_len", # size_t
+
+# Multi-key derivation purpose strings (TLS 1.2)
+ 'OSSL_KDF_PURPOSE_CLIENT_MAC_KEY' => "client_MAC_key",
+ 'OSSL_KDF_PURPOSE_SERVER_MAC_KEY' => "server_MAC_key",
+ 'OSSL_KDF_PURPOSE_CLIENT_CIPHER_KEY' => "client_cipher_key",
+ 'OSSL_KDF_PURPOSE_SERVER_CIPHER_KEY' => "server_cipher_key",
+ 'OSSL_KDF_PURPOSE_CLIENT_IV' => "client_iv",
+ 'OSSL_KDF_PURPOSE_SERVER_IV' => "server_iv",
+
+# Multi-key derivation purpose strings (TLS 1.3)
+ 'OSSL_KDF_PURPOSE_CLIENT_KEY' => "client_key",
+ 'OSSL_KDF_PURPOSE_SERVER_KEY' => "server_key",
+
# Known RAND names
'OSSL_RAND_PARAM_STATE' => "state",
'OSSL_RAND_PARAM_STRENGTH' => "strength",