From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 18 Oct 2023 15:18:49 +0000 (+0200)
Subject: pkcs7: Add supported for unprotected PKCS#7 encrypted-data
X-Git-Tag: 5.9.12rc1~7^2~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bdd8f14354673631ebe82a783c7c7870c51d9e3a;p=thirdparty%2Fstrongswan.git

pkcs7: Add supported for unprotected PKCS#7 encrypted-data
---

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_encrypted_data.c b/src/libstrongswan/plugins/pkcs7/pkcs7_encrypted_data.c
index 472e72e2a7..cdcb0eb719 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_encrypted_data.c
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_encrypted_data.c
@@ -54,6 +54,11 @@ static bool decrypt(pkcs5_t *pkcs5, chunk_t data, chunk_t *decrypted)
 	shared_key_t *shared;
 	bool success = FALSE;
 
+	if (pkcs5->decrypt(pkcs5, chunk_empty, data, decrypted))
+	{
+		return TRUE;
+	}
+
 	enumerator = lib->credmgr->create_shared_enumerator(lib->credmgr,
 										SHARED_PRIVATE_KEY_PASS, NULL, NULL);
 	while (enumerator->enumerate(enumerator, &shared, NULL, NULL))