diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-19 10:12:33 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:25 +0100 |
| commit | 5d0458af0aef7b3161957bec95016e728efc3c2d (patch) | |
| tree | e346b31e3e7c7232cd13f887e80f7399fef606a1 /src/libcharon/encoding/message.c | |
| parent | 2ee83c277898f5098cc761c7685953185872f4ca (diff) | |
| download | strongswan-5d0458af0aef7b3161957bec95016e728efc3c2d.tar.bz2 strongswan-5d0458af0aef7b3161957bec95016e728efc3c2d.tar.xz | |
Another set of cleanups in message.c
Diffstat (limited to 'src/libcharon/encoding/message.c')
| -rw-r--r-- | src/libcharon/encoding/message.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c index 532b00a5c..708e3fb97 100644 --- a/src/libcharon/encoding/message.c +++ b/src/libcharon/encoding/message.c @@ -1351,8 +1351,7 @@ static void order_payloads(private_message_t *this) /** * Wrap payloads in an encryption payload */ -static encryption_payload_t* wrap_payloads(private_message_t *this, - payload_type_t encryption_type) +static encryption_payload_t* wrap_payloads(private_message_t *this) { encryption_payload_t *encryption; linked_list_t *payloads; @@ -1366,7 +1365,14 @@ static encryption_payload_t* wrap_payloads(private_message_t *this, 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**)¤t) == SUCCESS) { 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); if (hash.ptr) { /* insert a HASH payload as first payload */ - hash_payload_t *hash_payload = hash_payload_create(HASH_V1); - hash_payload->set_hash(hash_payload, hash); - this->payloads->insert_first(this->payloads, - (payload_t*)hash_payload); + hash_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) { - DBG3(DBG_ENC, "encrypting IKEv1 INFORMATIONAL exchange message"); - this->is_encrypted = TRUE; - encrypted = TRUE; + this->is_encrypted = encrypted = TRUE; } - chunk_free(&hash); } - if (!encrypted) { - /* if at least one payload requires encryption, encrypt the message. - * if we have no key material available, the flag will be reset below */ + /* If at least one payload requires encryption, encrypt the message. + * If no key material is available, the flag will be reset below. */ enumerator = this->payloads->create_enumerator(this->payloads); while (enumerator->enumerate(enumerator, (void**)&payload)) { payload_rule_t *rule; + rule = get_payload_rule(this, payload->get_type(payload)); if (rule && rule->encrypted) { - this->is_encrypted = TRUE; - encrypted = TRUE; + this->is_encrypted = encrypted = TRUE; break; } } @@ -1495,8 +1497,7 @@ METHOD(message_t, generate, status_t, aead = keymat->get_aead(keymat, FALSE); if (aead && encrypted) { - encryption = wrap_payloads(this, this->is_encrypted ? ENCRYPTED_V1 - : ENCRYPTED); + encryption = wrap_payloads(this); } else { |