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

ikev2: Use IV generator to encrypt encrypted payload

Browse Source
This commit is contained in:
Tobias Brunner
2013-10-11 15:55:40 +02:00
parent 50bd28d549
commit b5010707a0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/encryption_payload.c
+9 -1
View File
@@ -313,6 +313,7 @@ METHOD(encryption_payload_t, encrypt, status_t,
{ {
chunk_t iv, plain, padding, icv, crypt; chunk_t iv, plain, padding, icv, crypt;
generator_t *generator; generator_t *generator;
iv_gen_t *iv_gen;
rng_t *rng; rng_t *rng;
size_t bs; size_t bs;
@@ -329,6 +330,13 @@ METHOD(encryption_payload_t, encrypt, status_t,
return NOT_SUPPORTED; return NOT_SUPPORTED;
} }
iv_gen = this->aead->get_iv_gen(this->aead);
if (!iv_gen)
{
DBG1(DBG_ENC, "encrypting encryption payload failed, no IV generator");
return NOT_SUPPORTED;
}
assoc = append_header(this, assoc); assoc = append_header(this, assoc);
generator = generator_create(); generator = generator_create();
@@ -356,7 +364,7 @@ METHOD(encryption_payload_t, encrypt, status_t,
crypt = chunk_create(plain.ptr, plain.len + padding.len); crypt = chunk_create(plain.ptr, plain.len + padding.len);
generator->destroy(generator); generator->destroy(generator);
if (!rng->get_bytes(rng, iv.len, iv.ptr) || if (!iv_gen->get_iv(iv_gen, iv.len, iv.ptr) ||
!rng->get_bytes(rng, padding.len - 1, padding.ptr)) !rng->get_bytes(rng, padding.len - 1, padding.ptr))
{ {
DBG1(DBG_ENC, "encrypting encryption payload failed, no IV or padding"); DBG1(DBG_ENC, "encrypting encryption payload failed, no IV or padding");