[kernel] r18355 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon Dec  5 06:50:48 2011
New Revision: 18355

Log:
xfrm: Fix key lengths for rfc3686(ctr(aes)) (Closes: #650652)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/xfrm-Fix-key-lengths-for-rfc3686-ctr-aes.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/40

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon Dec  5 06:04:56 2011	(r18354)
+++ dists/squeeze/linux-2.6/debian/changelog	Mon Dec  5 06:50:48 2011	(r18355)
@@ -43,6 +43,7 @@
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.49
     and the bug report which this closes: #650160.
   * gro: reset vlan_tci on reuse
+  * xfrm: Fix key lengths for rfc3686(ctr(aes)) (Closes: #650652)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 10 Nov 2011 02:28:55 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/xfrm-Fix-key-lengths-for-rfc3686-ctr-aes.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/xfrm-Fix-key-lengths-for-rfc3686-ctr-aes.patch	Mon Dec  5 06:50:48 2011	(r18355)
@@ -0,0 +1,39 @@
+From: Tushar Gohad <tgohad at mvista.com>
+Date: Thu, 28 Jul 2011 10:36:20 +0000
+Subject: [PATCH] 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 at mvista.com>
+Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ net/xfrm/xfrm_algo.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
+index 58064d9..791ab2e 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
+ 	}
+ },
+ };
+-- 
+1.7.7.3
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/40
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/40	Mon Dec  5 06:04:56 2011	(r18354)
+++ dists/squeeze/linux-2.6/debian/patches/series/40	Mon Dec  5 06:50:48 2011	(r18355)
@@ -31,3 +31,4 @@
 + debian/tty-Avoid-ABI-change-for-addition-of-get_icount.patch
 
 + bugfix/all/gro-reset-vlan_tci-on-reuse.patch
++ bugfix/all/xfrm-Fix-key-lengths-for-rfc3686-ctr-aes.patch