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

Some coding style cleanups

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:25 +01:00
parent 2f58f6cba1
commit b9a707e696
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
+6 -3
View File
@@ -1825,8 +1825,9 @@ static status_t decrypt_payloads(private_message_t *this, keymat_t *keymat)
{ /* instead of associated data we provide the IV, we also update { /* instead of associated data we provide the IV, we also update
* the IV with the last encrypted block */ * the IV with the last encrypted block */
keymat_v1_t *keymat_v1 = (keymat_v1_t*)keymat; keymat_v1_t *keymat_v1 = (keymat_v1_t*)keymat;
chunk_t last_block = chunk_create(chunk.ptr + chunk.len - bs, chunk_t last_block;
bs);
last_block = chunk_create(chunk.ptr + chunk.len - bs, bs);
chunk = keymat_v1->get_iv(keymat_v1, this->message_id); chunk = keymat_v1->get_iv(keymat_v1, this->message_id);
keymat_v1->update_iv(keymat_v1, this->message_id, last_block); keymat_v1->update_iv(keymat_v1, this->message_id, last_block);
} }
@@ -1978,15 +1979,17 @@ METHOD(message_t, parse_body, status_t,
{ {
keymat_v1_t *keymat_v1 = (keymat_v1_t*)keymat; keymat_v1_t *keymat_v1 = (keymat_v1_t*)keymat;
chunk_t hash; chunk_t hash;
hash = keymat_v1->get_hash_phase2(keymat_v1, &this->public); hash = keymat_v1->get_hash_phase2(keymat_v1, &this->public);
if (hash.ptr) if (hash.ptr)
{ {
hash_payload_t *hash_payload; hash_payload_t *hash_payload;
chunk_t other_hash; chunk_t other_hash;
if (this->first_payload != HASH_V1) if (this->first_payload != HASH_V1)
{ {
if (this->exchange_type == INFORMATIONAL_V1) if (this->exchange_type == INFORMATIONAL_V1)
{ /* TODO-IKEv1: Parse and log contents? */ {
DBG1(DBG_ENC, "ignoring unprotected INFORMATIONAL from %H", DBG1(DBG_ENC, "ignoring unprotected INFORMATIONAL from %H",
this->packet->get_source(this->packet)); this->packet->get_source(this->packet));
} }