Commit 7ee764b448 for openssl.org
commit 7ee764b44839443f0512df7678ae5a865fd62505
Author: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Tue Oct 6 20:18:58 2026 +0200
Add CHANGES.md and NEWS.md entries for multi-key derivation
Record the new EVP_KDF_derive_SKEYs() API and its provider interface for
the 4.2 release notes.
Assisted-By: Claude Opus 5 <noreply@anthropic.com>
Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
Reviewed-by: Simo Sorce <simo@redhat.com>
MergeDate: Wed Nov 18 12:11:53 2026
(Merged from https://github.com/openssl/openssl/pull/33082)
diff --git a/CHANGES.md b/CHANGES.md
index adae608d14..509d21eaa8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -122,6 +122,21 @@ OpenSSL 4.2
*Iva Marinova*
+ * Added support for deriving several symmetric keys and IVs from a single
+ KDF operation. `EVP_KDF_derive_SKEYs()` performs the derivation and
+ `EVP_KDF_CTX_get1_SKEY()` and `EVP_KDF_CTX_get0_IV()` collect the
+ individual results by purpose, for example "client_cipher_key" or
+ "server_iv". TLS1-PRF and TLS13-KDF implement it, so a TLS 1.2 key block
+ can be produced in one call. The caller names the cipher and MAC the keys
+ are for and the provider chooses the key type accordingly, which lets a
+ provider holding its keys on a token derive them all in a single
+ operation without ever exposing the raw bytes. Providers implement this
+ through the new `OSSL_FUNC_kdf_derive_multi()` and its companion
+ functions.
+ <!-- https://github.com/openssl/openssl/pull/33082 -->
+
+ *Dmitry Belyavskiy*
+
* `X509_OBJECT_up_ref_count()` has been deprecated. Despite its name,
`X509_OBJECT_up_ref_count()` does not reference count the `X509_OBJECT`
itself. With `X509_OBJECT` being opaque, there is nothing useful
diff --git a/NEWS.md b/NEWS.md
index 583035b593..3f6af9fcb0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -34,6 +34,10 @@ OpenSSL 4.2
* Added support for Java keytool PKCS#12 files with symmetric keys.
New API `PKCS12_parse_ex()` with `PKCS12_PARSE_CTX` has been added.
+ * Added support for deriving several `EVP_SKEY` objects and IVs from a
+ single KDF operation, as TLS requires. New API `EVP_KDF_derive_SKEYs()`,
+ `EVP_KDF_CTX_get1_SKEY()` and `EVP_KDF_CTX_get0_IV()` have been added.
+
OpenSSL 4.1
-----------