denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pem: Support PEM-encoded PKCS#7 container

Browse Source
This commit is contained in:
Andreas Steffen
2022-07-06 20:38:00 +02:00
parent e8c2ae3c54
commit 2b474073d9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/pem/pem_plugin.c
+2
View File
@@ -128,6 +128,8 @@ METHOD(plugin_t, get_features, int,
PLUGIN_REGISTER(CONTAINER_DECODE, pem_container_load, FALSE), PLUGIN_REGISTER(CONTAINER_DECODE, pem_container_load, FALSE),
PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS12), PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS12),
PLUGIN_DEPENDS(CONTAINER_DECODE, CONTAINER_PKCS12), PLUGIN_DEPENDS(CONTAINER_DECODE, CONTAINER_PKCS12),
PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS7),
PLUGIN_DEPENDS(CONTAINER_DECODE, CONTAINER_PKCS7),
}; };
*features = f; *features = f;
return countof(f); return countof(f);
src/pki/commands/pkcs7.c
+3 -3
View File
@@ -87,7 +87,7 @@ static int verify(chunk_t chunk)
bool verified = FALSE; bool verified = FALSE;
container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7, container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7,
BUILD_BLOB_ASN1_DER, chunk, BUILD_END); BUILD_BLOB, chunk, BUILD_END);
if (!container) if (!container)
{ {
return 1; return 1;
@@ -209,7 +209,7 @@ static int decrypt(chunk_t chunk)
chunk_t data; chunk_t data;
container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7, container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7,
BUILD_BLOB_ASN1_DER, chunk, BUILD_END); BUILD_BLOB, chunk, BUILD_END);
if (!container) if (!container)
{ {
return 1; return 1;
@@ -247,7 +247,7 @@ static int show(chunk_t chunk)
chunk_t data; chunk_t data;
container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7, container = lib->creds->create(lib->creds, CRED_CONTAINER, CONTAINER_PKCS7,
BUILD_BLOB_ASN1_DER, chunk, BUILD_END); BUILD_BLOB, chunk, BUILD_END);
if (!container) if (!container)
{ {
return 1; return 1;