diff options
| author | Martin Willi <martin@strongswan.org> | 2006-06-15 11:09:11 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-06-15 11:09:11 +0000 |
| commit | c095388f7f04930171eca643f29db972ec7d9ed5 (patch) | |
| tree | 07acc62917bfd4a95a3a7fca76afa6431587c974 /src/charon/encoding/message.c | |
| parent | 3efbf983124b6cd89087a3967bdfdfe0ccc607e3 (diff) | |
| download | strongswan-c095388f7f04930171eca643f29db972ec7d9ed5.tar.bz2 strongswan-c095388f7f04930171eca643f29db972ec7d9ed5.tar.xz | |
added support for "ike" and "esp" keywords
fixed bugs in proposal code
algorithm selection for charon works now with ipsec.conf
a lot of other fixes
Diffstat (limited to 'src/charon/encoding/message.c')
| -rw-r--r-- | src/charon/encoding/message.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/charon/encoding/message.c b/src/charon/encoding/message.c index 0629fb769..ece29094f 100644 --- a/src/charon/encoding/message.c +++ b/src/charon/encoding/message.c @@ -966,7 +966,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig if (payload_number != this->payloads->get_count(this->payloads)) { /* encrypted payload is not last one */ - this->logger->log(this->logger, ERROR | LEVEL1, "encrypted payload is not last payload"); + this->logger->log(this->logger, ERROR, "encrypted payload is not last payload"); iterator->destroy(iterator); return FAILED; } @@ -976,7 +976,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig status = encryption_payload->verify_signature(encryption_payload, this->packet->get_data(this->packet)); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR | LEVEL1, "encryption payload signature invalid"); + this->logger->log(this->logger, ERROR, "encryption payload signature invalid"); iterator->destroy(iterator); return status; } @@ -984,7 +984,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig status = encryption_payload->decrypt(encryption_payload); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR | LEVEL1, + this->logger->log(this->logger, ERROR, "encrypted payload could not be decrypted and parsed: %s", mapping_find(status_m, status)); iterator->destroy(iterator); @@ -1045,7 +1045,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig if (status != SUCCESS) { /* payload is not allowed */ - this->logger->log(this->logger, ERROR | LEVEL1, "payload type %s not allowed", + this->logger->log(this->logger, ERROR, "payload type %s not allowed", mapping_find(payload_type_m,current_payload_type)); iterator->destroy(iterator); return status; @@ -1055,7 +1055,7 @@ static status_t decrypt_payloads(private_message_t *this,crypter_t *crypter, sig if (payload_rule->encrypted != current_payload_was_encrypted) { /* payload was not encrypted, but should have been. or vice-versa */ - this->logger->log(this->logger, ERROR | LEVEL1, "payload type %s should be %s!", + this->logger->log(this->logger, ERROR, "payload type %s should be %s!", mapping_find(payload_type_m,current_payload_type), (payload_rule->encrypted) ? "encrypted" : "not encrypted"); iterator->destroy(iterator); @@ -1276,7 +1276,7 @@ message_t *message_create_notify_reply(host_t *source, host_t *destination, exch message->set_message_id(message,0); message->set_ike_sa_id(message, ike_sa_id); - payload = notify_payload_create_from_protocol_and_type(PROTO_IKE, notify_type); + payload = notify_payload_create_from_protocol_and_type(PROTO_NONE, notify_type); message->add_payload(message,(payload_t *) payload); return message; |