diff options
| author | Martin Willi <martin@strongswan.org> | 2008-10-14 15:17:44 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-10-14 15:17:44 +0000 |
| commit | e517b4b174abae6924f4c5f17a41e1ef39991cbc (patch) | |
| tree | 1281bfcc39628fd63f17357cceaaab8844240c67 /src/charon/kernel/kernel_ipsec.h | |
| parent | c25c8dce60f40df4f55b1bbb321ff6ca9c08be2b (diff) | |
| download | strongswan-e517b4b174abae6924f4c5f17a41e1ef39991cbc.tar.bz2 strongswan-e517b4b174abae6924f4c5f17a41e1ef39991cbc.tar.xz | |
passing chunks, not prf+, to kernel interface
gives us better control of keymat in CHILD_SA
Diffstat (limited to 'src/charon/kernel/kernel_ipsec.h')
| -rw-r--r-- | src/charon/kernel/kernel_ipsec.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/charon/kernel/kernel_ipsec.h b/src/charon/kernel/kernel_ipsec.h index 8fa5fb006..bef496a88 100644 --- a/src/charon/kernel/kernel_ipsec.h +++ b/src/charon/kernel/kernel_ipsec.h @@ -133,10 +133,9 @@ struct kernel_ipsec_t { * @param expire_soft lifetime in seconds before rekeying * @param expire_hard lifetime in seconds before delete * @param enc_alg Algorithm to use for encryption (ESP only) - * @param enc_size key length of encryption algorithm, if dynamic + * @param enc_key key to use for encryption * @param int_alg Algorithm to use for integrity protection - * @param int_size key length of integrity algorithm, if dynamic - * @param prf_plus PRF to derive keys from + * @param int_key key to use for integrity protection * @param mode mode of the SA (tunnel, transport) * @param ipcomp IPComp transform to use * @param encap enable UDP encapsulation for NAT traversal @@ -147,10 +146,9 @@ struct kernel_ipsec_t { host_t *src, host_t *dst, u_int32_t spi, protocol_id_t protocol, u_int32_t reqid, u_int64_t expire_soft, u_int64_t expire_hard, - u_int16_t enc_alg, u_int16_t enc_size, - u_int16_t int_alg, u_int16_t int_size, - prf_plus_t *prf_plus, ipsec_mode_t mode, - u_int16_t ipcomp, bool encap, + u_int16_t enc_alg, chunk_t enc_key, + u_int16_t int_alg, chunk_t int_key, + ipsec_mode_t mode, u_int16_t ipcomp, bool encap, bool update); /** |