diff options
| author | Martin Willi <martin@strongswan.org> | 2006-04-19 11:40:48 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-04-19 11:40:48 +0000 |
| commit | ec6582ccaa59e38cb83650c7c6b8312dc9768e87 (patch) | |
| tree | 62fd80d2251aae22e40a38ada08ea9e59b602629 /Source/charon | |
| parent | 4a93d6bafd543284b2fd77a7c29f1a526758fbca (diff) | |
| download | strongswan-ec6582ccaa59e38cb83650c7c6b8312dc9768e87.tar.bz2 strongswan-ec6582ccaa59e38cb83650c7c6b8312dc9768e87.tar.xz | |
- x509 certificate loading with pluto asn1 code
- x509 needs a lot more attention!
Diffstat (limited to 'Source/charon')
| -rw-r--r-- | Source/charon/daemon.c | 2 | ||||
| -rwxr-xr-x | Source/charon/threads/stroke_interface.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/charon/daemon.c b/Source/charon/daemon.c index aafc86ab1..d7265531d 100644 --- a/Source/charon/daemon.c +++ b/Source/charon/daemon.c @@ -266,7 +266,7 @@ void signal_handler(int signal) logger->log(logger, ERROR, " %s", strings[i]); } free (strings); - /* kill ourselve the hard way, anything other may result in more SIGSEGVs*/ + logger->log(logger, ERROR, "Killing ourself hard after SIGSEGV"); kill(getpid(), SIGKILL); } diff --git a/Source/charon/threads/stroke_interface.c b/Source/charon/threads/stroke_interface.c index 8302d1e25..274791bcf 100755 --- a/Source/charon/threads/stroke_interface.c +++ b/Source/charon/threads/stroke_interface.c @@ -36,7 +36,7 @@ #include <stroke.h> #include <types.h> #include <daemon.h> -#include <crypto/certificate.h> +#include <crypto/x509.h> #include <queues/jobs/initiate_ike_sa_job.h> @@ -280,7 +280,7 @@ static void stroke_add_conn(private_stroke_t *this, stroke_msg_t *msg) host_t *my_host, *other_host, *my_subnet, *other_subnet; proposal_t *proposal; traffic_selector_t *my_ts, *other_ts; - certificate_t *my_cert, *other_cert; + x509_t *my_cert, *other_cert; rsa_private_key_t *private_key = NULL; rsa_public_key_t *public_key = NULL; @@ -419,7 +419,7 @@ static void stroke_add_conn(private_stroke_t *this, stroke_msg_t *msg) chdir(CERTIFICATE_DIR); - my_cert = certificate_create_from_file(msg->add_conn.me.cert); + my_cert = x509_create_from_file(msg->add_conn.me.cert); if (my_cert == NULL) { this->stroke_logger->log(this->stroke_logger, ERROR, "loading own certificate \"%s%s\" failed", @@ -442,7 +442,7 @@ static void stroke_add_conn(private_stroke_t *this, stroke_msg_t *msg) } my_cert->destroy(my_cert); } - other_cert = certificate_create_from_file(msg->add_conn.other.cert); + other_cert = x509_create_from_file(msg->add_conn.other.cert); public_key = NULL; if (other_cert == NULL) { |