aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Gohad <tgohad@mvista.com>2011-07-28 10:36:20 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-15 18:31:39 -0700
commit3b9dfc69a292c4397815756bb404f2cda44ae7de (patch)
tree36eff860b800c75175532b8d87ff506a650f08ff
parentd98630f19f4880bfdb170231ef9f0ba781ecc850 (diff)
downloadlinux-linaro-3b9dfc69a292c4397815756bb404f2cda44ae7de.tar.gz
xfrm: Fix key lengths for rfc3686(ctr(aes))
[ Upstream commit 4203223a1aed862b4445fdcd260d6139603a51d9 ] Fix the min and max bit lengths for AES-CTR (RFC3686) keys. The number of bits in key spec is the key length (128/256) plus 32 bits of nonce. This change takes care of the "Invalid key length" errors reported by setkey when specifying 288 bit keys for aes-ctr. Signed-off-by: Tushar Gohad <tgohad@mvista.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/xfrm/xfrm_algo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 58064d9e565..791ab2e77f3 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -462,8 +462,8 @@ static struct xfrm_algo_desc ealg_list[] = {
.desc = {
.sadb_alg_id = SADB_X_EALG_AESCTR,
.sadb_alg_ivlen = 8,
- .sadb_alg_minbits = 128,
- .sadb_alg_maxbits = 256
+ .sadb_alg_minbits = 160,
+ .sadb_alg_maxbits = 288
}
},
};