]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
vici: Use the more generic BUILD_BLOB to parse certificates/public keys
authorTobias Brunner <tobias@strongswan.org>
Mon, 21 Jun 2021 09:39:07 +0000 (11:39 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 23 Aug 2021 15:59:39 +0000 (17:59 +0200)
src/libcharon/plugins/vici/vici_config.c
src/libcharon/plugins/vici/vici_cred.c

index 2a4d58eabb976807e305f3f9649020d69f2b6b12..4659f8f6a04975d8542a21a6f337556959cb9f82 100644 (file)
@@ -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);
index 6310fdcb82fd3a1f676e42da861632a08e40fb56..02a3db7f132ebb44694c911d5402ca7fc9f70efe 100644 (file)
@@ -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)