aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2009-12-09 06:11:15 +0000
committerDavid S. Miller <davem@davemloft.net>2009-12-11 15:07:57 -0800
commitc20a66f474e890dd8cc34e124632cd85e4165899 (patch)
treee311e92cf7de876e9b8c2b9ab4103d31fde63f18 /net
parentde039f02d877af52b8d0fe77878b8343a0f99d8b (diff)
downloadkernel_samsung_crespo-c20a66f474e890dd8cc34e124632cd85e4165899.zip
kernel_samsung_crespo-c20a66f474e890dd8cc34e124632cd85e4165899.tar.gz
kernel_samsung_crespo-c20a66f474e890dd8cc34e124632cd85e4165899.tar.bz2
xfrm: Fix truncation length of authentication algorithms installed via PF_KEY
Commit 4447bb33f09444920a8f1d89e1540137429351b6 ("xfrm: Store aalg in xfrm_state with a user specified truncation length") breaks installation of authentication algorithms via PF_KEY, as the state specific truncation length is not installed with the algorithms default truncation length. This patch initializes state properly to the default if installed via PF_KEY. Signed-off-by: Martin Willi <martin@strongswan.org> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/key/af_key.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 84209fb..76fa6fe 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1193,6 +1193,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
x->aalg->alg_key_len = key->sadb_key_bits;
memcpy(x->aalg->alg_key, key+1, keysize);
}
+ x->aalg->alg_trunc_len = a->uinfo.auth.icv_truncbits;
x->props.aalgo = sa->sadb_sa_auth;
/* x->algo.flags = sa->sadb_sa_flags; */
}