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

Fixed encryption of IKEv2 messages.

Browse Source
This commit is contained in:
Tobias Brunner
2012-03-20 17:30:50 +01:00
parent d020d4d695
commit f4e21faa98
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
@@ -1505,7 +1505,8 @@ METHOD(message_t, generate, status_t,
ike_header->destroy(ike_header); ike_header->destroy(ike_header);
if (encryption) if (encryption)
{ { /* set_transform() has to be called before get_length() */
encryption->set_transform(encryption, aead);
if (this->is_encrypted) if (this->is_encrypted)
{ /* for IKEv1 instead of associated data we provide the IV */ { /* for IKEv1 instead of associated data we provide the IV */
chunk = keymat_v1->get_iv(keymat_v1, this->message_id); chunk = keymat_v1->get_iv(keymat_v1, this->message_id);
@@ -1516,7 +1517,6 @@ METHOD(message_t, generate, status_t,
/* fill in length, including encryption payload */ /* fill in length, including encryption payload */
htoun32(lenpos, chunk.len + encryption->get_length(encryption)); htoun32(lenpos, chunk.len + encryption->get_length(encryption));
} }
encryption->set_transform(encryption, aead);
this->payloads->insert_last(this->payloads, encryption); this->payloads->insert_last(this->payloads, encryption);
if (!encryption->encrypt(encryption, chunk)) if (!encryption->encrypt(encryption, chunk))
{ {