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

Another set of cleanups in message.c

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:25 +01:00
parent 2ee83c2778
commit 5d0458af0a
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
+19 -18
View File
@@ -1351,8 +1351,7 @@ static void order_payloads(private_message_t *this)
/** /**
* Wrap payloads in an encryption payload * Wrap payloads in an encryption payload
*/ */
static encryption_payload_t* wrap_payloads(private_message_t *this, static encryption_payload_t* wrap_payloads(private_message_t *this)
payload_type_t encryption_type)
{ {
encryption_payload_t *encryption; encryption_payload_t *encryption;
linked_list_t *payloads; linked_list_t *payloads;
@@ -1366,7 +1365,14 @@ static encryption_payload_t* wrap_payloads(private_message_t *this,
payloads->insert_last(payloads, current); payloads->insert_last(payloads, current);
} }
encryption = encryption_payload_create(encryption_type); if (this->is_encrypted)
{
encryption = encryption_payload_create(ENCRYPTED_V1);
}
else
{
encryption = encryption_payload_create(ENCRYPTED);
}
while (payloads->remove_first(payloads, (void**)&current) == SUCCESS) while (payloads->remove_first(payloads, (void**)&current) == SUCCESS)
{ {
payload_rule_t *rule; payload_rule_t *rule;
@@ -1455,34 +1461,30 @@ METHOD(message_t, generate, status_t,
chunk_t hash = keymat_v1->get_hash_phase2(keymat_v1, &this->public); chunk_t hash = keymat_v1->get_hash_phase2(keymat_v1, &this->public);
if (hash.ptr) if (hash.ptr)
{ /* insert a HASH payload as first payload */ { /* insert a HASH payload as first payload */
hash_payload_t *hash_payload = hash_payload_create(HASH_V1); hash_payload_t *hash_payload;
hash_payload->set_hash(hash_payload, hash);
this->payloads->insert_first(this->payloads,
(payload_t*)hash_payload);
hash_payload = hash_payload_create(HASH_V1);
hash_payload->set_hash(hash_payload, hash);
this->payloads->insert_first(this->payloads, hash_payload);
if (this->exchange_type == INFORMATIONAL_V1) if (this->exchange_type == INFORMATIONAL_V1)
{ {
DBG3(DBG_ENC, "encrypting IKEv1 INFORMATIONAL exchange message"); this->is_encrypted = encrypted = TRUE;
this->is_encrypted = TRUE;
encrypted = TRUE;
} }
chunk_free(&hash); chunk_free(&hash);
} }
if (!encrypted) if (!encrypted)
{ {
/* if at least one payload requires encryption, encrypt the message. /* If at least one payload requires encryption, encrypt the message.
* if we have no key material available, the flag will be reset below */ * If no key material is available, the flag will be reset below. */
enumerator = this->payloads->create_enumerator(this->payloads); enumerator = this->payloads->create_enumerator(this->payloads);
while (enumerator->enumerate(enumerator, (void**)&payload)) while (enumerator->enumerate(enumerator, (void**)&payload))
{ {
payload_rule_t *rule; payload_rule_t *rule;
rule = get_payload_rule(this, payload->get_type(payload)); rule = get_payload_rule(this, payload->get_type(payload));
if (rule && rule->encrypted) if (rule && rule->encrypted)
{ {
this->is_encrypted = TRUE; this->is_encrypted = encrypted = TRUE;
encrypted = TRUE;
break; break;
} }
} }
@@ -1495,8 +1497,7 @@ METHOD(message_t, generate, status_t,
aead = keymat->get_aead(keymat, FALSE); aead = keymat->get_aead(keymat, FALSE);
if (aead && encrypted) if (aead && encrypted)
{ {
encryption = wrap_payloads(this, this->is_encrypted ? ENCRYPTED_V1 encryption = wrap_payloads(this);
: ENCRYPTED);
} }
else else
{ {