strongswan.org
Wiki/Project Management
Downloads
Gitweb
projects
/
strongswan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0e80127
)
ikev2: Fix size of key material for CAMELLIA-CTR
author
Tobias Brunner
<tobias@strongswan.org>
Mon, 21 Sep 2015 09:11:33 +0000
(11:11 +0200)
committer
Tobias Brunner
<tobias@strongswan.org>
Fri, 30 Oct 2015 10:04:42 +0000
(11:04 +0100)
Like AES in CTR mode it includes a 4 byte nonce.
src/libcharon/sa/ikev2/keymat_v2.c
patch
|
blob
|
history
diff --git
a/src/libcharon/sa/ikev2/keymat_v2.c
b/src/libcharon/sa/ikev2/keymat_v2.c
index
fce0840
..
55cb5dd
100644
(file)
--- a/
src/libcharon/sa/ikev2/keymat_v2.c
+++ b/
src/libcharon/sa/ikev2/keymat_v2.c
@@
-527,6
+527,7
@@
METHOD(keymat_v2_t, derive_child_keys, bool,
case ENCR_AES_GCM_ICV12:
case ENCR_AES_GCM_ICV16:
case ENCR_AES_CTR:
+ case ENCR_CAMELLIA_CTR:
case ENCR_NULL_AUTH_AES_GMAC:
case ENCR_CHACHA20_POLY1305:
enc_size += 4;