From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 21 Jun 2021 09:39:07 +0000 (+0200)
Subject: vici: Use the more generic BUILD_BLOB to parse certificates/public keys
X-Git-Tag: 5.9.4dr2~16^2~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=de5609b2974b0a98ebd19178c4a001bc89b30431;p=thirdparty%2Fstrongswan.git

vici: Use the more generic BUILD_BLOB to parse certificates/public keys
---

diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
index 2a4d58eabb..4659f8f6a0 100644
--- a/src/libcharon/plugins/vici/vici_config.c
+++ b/src/libcharon/plugins/vici/vici_config.c
@@ -1469,7 +1469,7 @@ static bool parse_cert(auth_data_t *auth, auth_rule_t rule, chunk_t v)
 	certificate_t *cert;
 
 	cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509,
-							  BUILD_BLOB_PEM, v, BUILD_END);
+							  BUILD_BLOB, v, BUILD_END);
 	if (cert)
 	{
 		return add_cert(auth, rule, cert);
@@ -1504,7 +1504,7 @@ CALLBACK(parse_pubkeys, bool,
 	certificate_t *cert;
 
 	cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_TRUSTED_PUBKEY,
-							  BUILD_BLOB_PEM, v, BUILD_END);
+							  BUILD_BLOB, v, BUILD_END);
 	if (cert)
 	{
 		return add_cert(auth, AUTH_RULE_SUBJECT_CERT, cert);
diff --git a/src/libcharon/plugins/vici/vici_cred.c b/src/libcharon/plugins/vici/vici_cred.c
index 6310fdcb82..02a3db7f13 100644
--- a/src/libcharon/plugins/vici/vici_cred.c
+++ b/src/libcharon/plugins/vici/vici_cred.c
@@ -173,7 +173,7 @@ CALLBACK(load_cert, vici_message_t*,
 	ext_flag = (flag & X509_CA) ? X509_NONE : flag;
 
 	cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, type,
-							  BUILD_BLOB_PEM, data,
+							  BUILD_BLOB, data,
 							  BUILD_X509_FLAG, ext_flag,
 							  BUILD_END);
 	if (!cert)