denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable the generation of unencrypted messages (e.g. ME connectivity checks).

Browse Source
This commit is contained in:
Tobias Brunner
2010-08-30 17:25:12 +02:00
parent 68eb610d81
commit 9b698a771c
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
+10 -9
View File
@@ -954,7 +954,7 @@ static void order_payloads(private_message_t *this)
} }
/** /**
* Wrap payloads in a encryption payload, if required * Wrap payloads in a encryption payload
*/ */
static encryption_payload_t* wrap_payloads(private_message_t *this) static encryption_payload_t* wrap_payloads(private_message_t *this)
{ {
@@ -962,12 +962,6 @@ static encryption_payload_t* wrap_payloads(private_message_t *this)
linked_list_t *payloads; linked_list_t *payloads;
payload_t *current; payload_t *current;
if (!this->rule->encrypted)
{
DBG2(DBG_ENC, "not encrypting payloads");
return NULL;
}
/* copy all payloads in a temporary list */ /* copy all payloads in a temporary list */
payloads = linked_list_create(); payloads = linked_list_create();
while (this->payloads->remove_first(this->payloads, while (this->payloads->remove_first(this->payloads,
@@ -1013,7 +1007,7 @@ METHOD(message_t, generate, status_t,
generator_t *generator; generator_t *generator;
ike_header_t *ike_header; ike_header_t *ike_header;
payload_t *payload, *next; payload_t *payload, *next;
encryption_payload_t *encryption; encryption_payload_t *encryption = NULL;
enumerator_t *enumerator; enumerator_t *enumerator;
chunk_t chunk; chunk_t chunk;
char str[256]; char str[256];
@@ -1049,7 +1043,14 @@ METHOD(message_t, generate, status_t,
DBG1(DBG_ENC, "generating %s", get_string(this, str, sizeof(str))); DBG1(DBG_ENC, "generating %s", get_string(this, str, sizeof(str)));
encryption = wrap_payloads(this); if (aead && this->rule->encrypted)
{
encryption = wrap_payloads(this);
}
else
{
DBG2(DBG_ENC, "not encrypting payloads");
}
ike_header = ike_header_create(); ike_header = ike_header_create();
ike_header->set_exchange_type(ike_header, this->exchange_type); ike_header->set_exchange_type(ike_header, this->exchange_type);