From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 6 Jul 2022 18:38:00 +0000 (+0200)
Subject: pem: Support PEM-encoded PKCS#7 container
X-Git-Tag: 5.9.7rc1~16
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2b474073d9a035e5f1829c2530406a7305183ba7;p=thirdparty%2Fstrongswan.git

pem: Support PEM-encoded PKCS#7 container
---

diff --git a/src/libstrongswan/plugins/pem/pem_plugin.c b/src/libstrongswan/plugins/pem/pem_plugin.c
index 6e32a1d953..d8045ed594 100644
--- a/src/libstrongswan/plugins/pem/pem_plugin.c
+++ b/src/libstrongswan/plugins/pem/pem_plugin.c
@@ -128,6 +128,8 @@ METHOD(plugin_t, get_features, int,
 		PLUGIN_REGISTER(CONTAINER_DECODE, pem_container_load, FALSE),
 			PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS12),
 				PLUGIN_DEPENDS(CONTAINER_DECODE, CONTAINER_PKCS12),
+			PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS7),
+				PLUGIN_DEPENDS(CONTAINER_DECODE, CONTAINER_PKCS7),
 	};
 	*features = f;
 	return countof(f);
diff --git a/src/pki/commands/pkcs7.c b/src/pki/commands/pkcs7.c
index 9de0d3a5f4..fd474a1a4c 100644
--- a/src/pki/commands/pkcs7.c
+++ b/src/pki/commands/pkcs7.c
@@ -87,7 +87,7 @@ static int verify(chunk_t chunk)
 	bool verified = FALSE;
 
 	container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7,
-								   BUILD_BLOB_ASN1_DER, chunk, BUILD_END);
+								   BUILD_BLOB, chunk, BUILD_END);
 	if (!container)
 	{
 		return 1;
@@ -209,7 +209,7 @@ static int decrypt(chunk_t chunk)
 	chunk_t data;
 
 	container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7,
-								   BUILD_BLOB_ASN1_DER, chunk, BUILD_END);
+								   BUILD_BLOB, chunk, BUILD_END);
 	if (!container)
 	{
 		return 1;
@@ -247,7 +247,7 @@ static int show(chunk_t chunk)
 	chunk_t data;
 
 	container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7,
-								   BUILD_BLOB_ASN1_DER, chunk, BUILD_END);
+								   BUILD_BLOB, chunk, BUILD_END);
 	if (!container)
 	{
 		return 1;