From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 11 Jul 2025 09:42:47 +0000 (+0200)
Subject: openssl: Don't allocate salt if PRF/hash is unknown
X-Git-Tag: 6.0.2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43b805b2daed48bdf835ca8eeb87b9b71a42781f;p=thirdparty%2Fstrongswan.git

openssl: Don't allocate salt if PRF/hash is unknown

This can happen if e.g. AES-XCBC is selected.

Fixes: 2dbeecfc029b ("openssl: Fix testing KDF_PRF in the constructor with OpenSSL 3.5.1")
---

diff --git a/src/libstrongswan/plugins/openssl/openssl_kdf.c b/src/libstrongswan/plugins/openssl/openssl_kdf.c
index e1b67c920d..4611a38824 100644
--- a/src/libstrongswan/plugins/openssl/openssl_kdf.c
+++ b/src/libstrongswan/plugins/openssl/openssl_kdf.c
@@ -203,7 +203,7 @@ kdf_t *openssl_kdf_create(key_derivation_function_t algo, va_list args)
 
 	/* also generate a salt (as if none was provided, i.e. zeroes of hash length)
 	 * as OpenSSL 3.5.1+ won't accept NULL anymore */
-	if (algo == KDF_PRF)
+	if (algo == KDF_PRF && this->hasher)
 	{
 		this->salt = chunk_copy_pad(chunk_alloc(get_length(this)),
 									chunk_empty, 0);