diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-01-05 23:52:55 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-01-09 07:23:30 +0100 |
| commit | abe6d07463d99e5332484047dd18186205e2d267 (patch) | |
| tree | d9c61a6a1307bfdb2eb029a52042c6488379b5bc | |
| parent | b83cef24120b1b65837860e460f6f534dd4b731e (diff) | |
| download | strongswan-abe6d07463d99e5332484047dd18186205e2d267.tar.bz2 strongswan-abe6d07463d99e5332484047dd18186205e2d267.tar.xz | |
swanctl: Load pubkeys with load-creds
| -rw-r--r-- | src/libcharon/plugins/vici/vici_cert_info.c | 13 | ||||
| -rw-r--r-- | src/swanctl/commands/load_creds.c | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/libcharon/plugins/vici/vici_cert_info.c b/src/libcharon/plugins/vici/vici_cert_info.c index 61871e217..2f278de5e 100644 --- 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 81204ca44..4647934f7 100644 --- 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); |