aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ah4.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-10-08 20:14:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:54:53 -0400
commitbc31d3b2c7d7f2a03721a05cb3c9a3ce8b1e2e5a (patch)
tree4e72919c351590c8276534e797eae8260d20f28c /net/ipv4/ah4.c
parent4b7137ff8fb49d7bf22dfa248baa0d02ace2c43d (diff)
[IPSEC] ah: Remove keys from ah_data structure
The keys are only used during initialisation so we don't need to carry them in esp_data. Since we don't have to allocate them again, there is no need to place a limit on the authentication key length anymore. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ah4.c')
-rw-r--r--net/ipv4/ah4.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 39f6211f1496..dc1d8e871b24 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -219,10 +219,6 @@ static int ah_init_state(struct xfrm_state *x)
219 if (!x->aalg) 219 if (!x->aalg)
220 goto error; 220 goto error;
221 221
222 /* null auth can use a zero length key */
223 if (x->aalg->alg_key_len > 512)
224 goto error;
225
226 if (x->encap) 222 if (x->encap)
227 goto error; 223 goto error;
228 224
@@ -230,14 +226,13 @@ static int ah_init_state(struct xfrm_state *x)
230 if (ahp == NULL) 226 if (ahp == NULL)
231 return -ENOMEM; 227 return -ENOMEM;
232 228
233 ahp->key = x->aalg->alg_key;
234 ahp->key_len = (x->aalg->alg_key_len+7)/8;
235 tfm = crypto_alloc_hash(x->aalg->alg_name, 0, CRYPTO_ALG_ASYNC); 229 tfm = crypto_alloc_hash(x->aalg->alg_name, 0, CRYPTO_ALG_ASYNC);
236 if (IS_ERR(tfm)) 230 if (IS_ERR(tfm))
237 goto error; 231 goto error;
238 232
239 ahp->tfm = tfm; 233 ahp->tfm = tfm;
240 if (crypto_hash_setkey(tfm, ahp->key, ahp->key_len)) 234 if (crypto_hash_setkey(tfm, x->aalg->alg_key,
235 (x->aalg->alg_key_len + 7) / 8))
241 goto error; 236 goto error;
242 237
243 /* 238 /*