swanctl: Load pubkeys with load-creds

diff --git a/src/libcharon/plugins/vici/vici_cert_info.c b/src/libcharon/plugins/vici/vici_cert_info.c
index 61871e2173ca77dc61add80ce7aab7e8094d5e6d..2f278de5ee7b3de4fb1cf0f60199da9e0d3bb029 100644 (file)
--- a/src/libcharon/plugins/vici/vici_cert_info.c
+++ b/src/libcharon/plugins/vici/vici_cert_info.c
@@ -29,12 +29,13 @@ typedef struct {
 } cert_type_t;
 
 static cert_type_t cert_types[] = {
-       { "x509",     CERT_X509,     X509_NONE        },
-       { "x509ca",   CERT_X509,     X509_CA          },
-       { "x509ocsp", CERT_X509,     X509_OCSP_SIGNER },
-       { "x509aa",   CERT_X509,     X509_AA          },
-       { "x509ac",   CERT_X509_AC,  X509_NONE        },
-       { "x509crl",  CERT_X509_CRL, X509_NONE        },
+       { "x509",     CERT_X509,           X509_NONE        },
+       { "x509ca",   CERT_X509,           X509_CA          },
+       { "x509ocsp", CERT_X509,           X509_OCSP_SIGNER },
+       { "x509aa",   CERT_X509,           X509_AA          },
+       { "x509ac",   CERT_X509_AC,        X509_NONE        },
+       { "x509crl",  CERT_X509_CRL,       X509_NONE        },
+       { "pubkey",   CERT_TRUSTED_PUBKEY, X509_NONE        },
 };
 
 bool vici_cert_info_from_str(char *type_str, certificate_type_t *type,

diff --git a/src/swanctl/commands/load_creds.c b/src/swanctl/commands/load_creds.c
index 81204ca44d33177aad7e10bda3aa6c52757018a6..4647934f7835ceb76bcd8086e13b3b2cdb57ee28 100644 (file)
--- a/src/swanctl/commands/load_creds.c
+++ b/src/swanctl/commands/load_creds.c
@@ -698,6 +698,7 @@ int load_creds_cfg(vici_conn_t *conn, command_format_options_t format,
        load_certs(conn, format, "x509aa",   SWANCTL_X509AADIR);
        load_certs(conn, format, "x509ac",   SWANCTL_X509ACDIR);
        load_certs(conn, format, "x509crl",  SWANCTL_X509CRLDIR);
+       load_certs(conn, format, "pubkey",   SWANCTL_PUBKEYDIR);
 
        load_keys(conn, format, noprompt, cfg, "rsa",   SWANCTL_RSADIR);
        load_keys(conn, format, noprompt, cfg, "ecdsa", SWANCTL_ECDSADIR);