diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-06-20 06:05:01 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-06-20 06:05:01 +0000 |
| commit | 21b433c64181a9ba25a558745a5850fe0ff32eb0 (patch) | |
| tree | fdd7f3f4b4cc6902415b14dea6aa154a65227abf /src/charon/daemon.c | |
| parent | db959e6ea364122140f5531958f59b096356d764 (diff) | |
| download | strongswan-21b433c64181a9ba25a558745a5850fe0ff32eb0.tar.bz2 strongswan-21b433c64181a9ba25a558745a5850fe0ff32eb0.tar.xz | |
implemented rereadcrls rereadcacerts
Diffstat (limited to 'src/charon/daemon.c')
| -rw-r--r-- | src/charon/daemon.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/charon/daemon.c b/src/charon/daemon.c index 16bd271f5..71726620b 100644 --- a/src/charon/daemon.c +++ b/src/charon/daemon.c @@ -33,8 +33,8 @@ #include "daemon.h" #include <types.h> +#include <config/credentials/credential_store.h> #include <config/connections/local_connection_store.h> -#include <config/credentials/local_credential_store.h> #include <config/policies/local_policy_store.h> @@ -167,7 +167,7 @@ static void kill_daemon(private_daemon_t *this, char *reason) */ static void initialize(private_daemon_t *this, bool strict) { - local_credential_store_t* cred_store; + credential_store_t* credentials; this->public.configuration = configuration_create(); this->public.socket = socket_create(IKEV2_UDP_PORT); @@ -177,11 +177,13 @@ static void initialize(private_daemon_t *this, bool strict) this->public.send_queue = send_queue_create(); this->public.connections = (connection_store_t*)local_connection_store_create(); this->public.policies = (policy_store_t*)local_policy_store_create(); - this->public.credentials = (credential_store_t*)(cred_store = local_credential_store_create(strict)); - - /* load keys & certs */ - cred_store->load_ca_certificates(cred_store, CA_CERTIFICATE_DIR); - cred_store->load_private_keys(cred_store, SECRETS_FILE, PRIVATE_KEY_DIR); + this->public.credentials = credential_store_create(strict); + + /* load keys, ca certificates and crls */ + credentials = this->public.credentials; + credentials->load_ca_certificates(credentials, CA_CERTIFICATE_DIR); + credentials->load_crls(credentials, CRL_DIR); + credentials->load_private_keys(credentials, SECRETS_FILE, PRIVATE_KEY_DIR); /* start building threads, we are multi-threaded NOW */ |