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 6e32a1d9537c3157ea0504d2fe5c814744642132..d8045ed594e8ec5de31241100b69a87ada8339e5 100644 (file)
--- 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 9de0d3a5f4bee3e5851d144557eed79081c83e3f..fd474a1a4c15ce36676d26193cd132552a6345bf 100644 (file)
--- 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;