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

ikev1: Don't cache last block of INFORMATIONAL messages as IV

Browse Source 
We don't expect a response with the same MID, but apparently some
devices (e.g. FRITZ!Box) do that for DPDs, while still treating the
response as a new exchange.  By storing the last message block as IV
we can't decrypt the first block of such a response.

Fixes #661.
This commit is contained in:
Tobias Brunner
2014-09-12 13:56:18 +02:00
parent 2e62f51bcc
commit 8a6b01dd2a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
+2 -2
View File
@@ -1632,7 +1632,7 @@ METHOD(message_t, generate, status_t,
chunk = generator->get_chunk(generator, &lenpos); chunk = generator->get_chunk(generator, &lenpos);
htoun32(lenpos, chunk.len); htoun32(lenpos, chunk.len);
this->packet->set_data(this->packet, chunk_clone(chunk)); this->packet->set_data(this->packet, chunk_clone(chunk));
if (this->is_encrypted) if (this->is_encrypted && this->exchange_type != INFORMATIONAL_V1)
{ {
/* update the IV for the next IKEv1 message */ /* update the IV for the next IKEv1 message */
chunk_t last_block; chunk_t last_block;
@@ -2142,7 +2142,7 @@ METHOD(message_t, parse_body, status_t,
} }
chunk_free(&hash); chunk_free(&hash);
} }
if (this->is_encrypted) if (this->is_encrypted && this->exchange_type != INFORMATIONAL_V1)
{ /* message verified, confirm IV */ { /* message verified, confirm IV */
if (!keymat_v1->confirm_iv(keymat_v1, this->message_id)) if (!keymat_v1->confirm_iv(keymat_v1, this->message_id))
{ {