sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-06 00:00:47 -04:00
Code Issues Projects Releases Wiki Activity

- fixed bad bug, certs load now cleanly again

Browse Source
This commit is contained in:
Martin Willi 2006-04-28 14:20:08 +00:00
parent a34d3c14a1
commit d4a35f80c1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/charon/charon/threads/stroke_interface.c
View File

@ -232,7 +232,7 @@ static void stroke_add_conn(private_stroke_t *this, stroke_msg_t *msg)
if (msg->add_conn.me.cert) if (msg->add_conn.me.cert)
{ {
char file[128]; char file[128];
snprintf(file, sizeof(file), "%s%s", CERTIFICATE_DIR, msg->add_conn.me.cert); snprintf(file, sizeof(file), "%s/%s", CERTIFICATE_DIR, msg->add_conn.me.cert);
cert = x509_create_from_file(file); cert = x509_create_from_file(file);
if (cert) if (cert)
{ {
@ -240,15 +240,15 @@ static void stroke_add_conn(private_stroke_t *this, stroke_msg_t *msg)
my_id = cert->get_subject(cert); my_id = cert->get_subject(cert);
my_id = my_id->clone(my_id); my_id = my_id->clone(my_id);
cert->destroy(cert); cert->destroy(cert);
this->stroke_logger->log(this->stroke_logger, CONTROL|LEVEL1, this->logger->log(this->logger, CONTROL,
"defined a valid certificate, using its ID \"%s\"", "defined a valid certificate, using its ID \"%s\"",
my_id->get_string(my_id)); my_id->get_string(my_id));
} }
} }
if (msg->add_conn.other.cert) if (msg->add_conn.other.cert)
{ {
char file[128]; char file[128];
snprintf(file, sizeof(file), "%s%s", CERTIFICATE_DIR, msg->add_conn.other.cert); snprintf(file, sizeof(file), "%s/%s", CERTIFICATE_DIR, msg->add_conn.other.cert);
cert = x509_create_from_file(file); cert = x509_create_from_file(file);
if (cert) if (cert)
{ {
@ -256,9 +256,9 @@ static void stroke_add_conn(private_stroke_t *this, stroke_msg_t *msg)
other_id = cert->get_subject(cert); other_id = cert->get_subject(cert);
other_id = other_id->clone(other_id); other_id = other_id->clone(other_id);
cert->destroy(cert); cert->destroy(cert);
this->stroke_logger->log(this->stroke_logger, CONTROL|LEVEL1, this->logger->log(this->logger, CONTROL,
"defined a valid certificate, using its ID \"%s\"", "defined a valid certificate, using its ID \"%s\"",
other_id->get_string(other_id)); other_id->get_string(other_id));
} }
} }
@ -536,6 +536,7 @@ static void stroke_receive(private_stroke_t *this)
continue; continue;
} }
/* TODO: BAD: does not work for starter, charon crashes!! FIX this */
this->stroke_logger = logger_create("-", CONTROL|ERROR, FALSE, strokefile); this->stroke_logger = logger_create("-", CONTROL|ERROR, FALSE, strokefile);
this->logger->log_bytes(this->logger, RAW, "stroke message", (void*)msg, msg_length); this->logger->log_bytes(this->logger, RAW, "stroke message", (void*)msg, msg_length);