From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 18 Dec 2020 13:17:37 +0000 (+0100)
Subject: openssl: Reset HMAC key if chunk_empty is passed
X-Git-Tag: 5.9.2dr2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a440f83ab8332fd045fe30d60182e9f031ea73b;p=thirdparty%2Fstrongswan.git

openssl: Reset HMAC key if chunk_empty is passed

If no valid key is configured (e.g. because it's inadvertently uninitialized),
we should not just reuse the previous key.

The `key_set` flag is not necessary anymore because a non-NULL key is set
during initialization since 6b347d5232c7 ("openssl: Ensure underlying hash
algorithm is available during HMAC init").
---

diff --git a/src/libstrongswan/plugins/openssl/openssl_hmac.c b/src/libstrongswan/plugins/openssl/openssl_hmac.c
index e0b9f21282..c4462fd3fd 100644
--- a/src/libstrongswan/plugins/openssl/openssl_hmac.c
+++ b/src/libstrongswan/plugins/openssl/openssl_hmac.c
@@ -76,37 +76,39 @@ struct private_mac_t {
 	 */
 	HMAC_CTX hmac_ctx;
 #endif
-
-	/**
-	 * Key set on HMAC_CTX?
-	 */
-	bool key_set;
 };
 
-METHOD(mac_t, set_key, bool,
-	private_mac_t *this, chunk_t key)
+/**
+ * Resets the state with the given key, or only resets the internal state
+ * if key is chunk_empty.
+ */
+static bool reset(private_mac_t *this, chunk_t key)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 	if (HMAC_Init_ex(this->hmac, key.ptr, key.len, this->hasher, NULL))
 	{
-		this->key_set = TRUE;
 		return TRUE;
 	}
 	return FALSE;
 #else /* OPENSSL_VERSION_NUMBER < 1.0 */
 	HMAC_Init_ex(this->hmac, key.ptr, key.len, this->hasher, NULL);
-	this->key_set = TRUE;
 	return TRUE;
 #endif
 }
 
+METHOD(mac_t, set_key, bool,
+	private_mac_t *this, chunk_t key)
+{
+	if (!key.ptr)
+	{	/* HMAC_Init_ex() won't reset the key if a NULL pointer is passed */
+		key = chunk_from_str("");
+	}
+	return reset(this, key);
+}
+
 METHOD(mac_t, get_mac, bool,
 	private_mac_t *this, chunk_t data, uint8_t *out)
 {
-	if (!this->key_set)
-	{
-		return FALSE;
-	}
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 	if (!HMAC_Update(this->hmac, data.ptr, data.len))
 	{
@@ -128,7 +130,7 @@ METHOD(mac_t, get_mac, bool,
 	}
 	HMAC_Final(this->hmac, out, NULL);
 #endif
-	return set_key(this, chunk_empty);
+	return reset(this, chunk_empty);
 }
 
 METHOD(mac_t, get_mac_size, size_t,