From de5609b2974b0a98ebd19178c4a001bc89b30431 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 21 Jun 2021 11:39:07 +0200 Subject: [PATCH] vici: Use the more generic BUILD_BLOB to parse certificates/public keys --- src/libcharon/plugins/vici/vici_config.c | 4 ++-- src/libcharon/plugins/vici/vici_cred.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c index 2a4d58eab..4659f8f6a 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 6310fdcb8..02a3db7f1 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)