From patchwork Wed Dec 7 04:37:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Owens X-Patchwork-Id: 129892 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3E3F01007D2 for ; Wed, 7 Dec 2011 15:38:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755646Ab1LGEh5 (ORCPT ); Tue, 6 Dec 2011 23:37:57 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:34742 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754746Ab1LGEh4 (ORCPT ); Tue, 6 Dec 2011 23:37:56 -0500 Received: by yenm1 with SMTP id m1so150122yen.19 for ; Tue, 06 Dec 2011 20:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=aRMjUPDE6aShmTN8JwDW8/11qOl8pb8H6b+3n/gyQCw=; b=X3EYms72rCPc10xcquvsvAcH1iYdGD8mrIVI8O/M6DUUXhP3+fixPi8gQTw0/mDo7s g4ITBaIOzZ+KREGZYyx9UCXc+CwV7Ux0tp0+QNU1GtuTjTkObSe/Ih0S8WXPVRLOgPbo yJPxOfctBA9Vwkff7fVIDsh6wfaM9aZHyoiAc= Received: by 10.236.150.134 with SMTP id z6mr3247317yhj.42.1323232675664; Tue, 06 Dec 2011 20:37:55 -0800 (PST) Received: from localhost.localdomain (cpe-76-187-13-111.tx.res.rr.com. [76.187.13.111]) by mx.google.com with ESMTPS id a7sm1604305ana.5.2011.12.06.20.37.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Dec 2011 20:37:54 -0800 (PST) From: Calvin Owens To: stable@vger.kernel.org Cc: "David S. Miller" , Calvin Owens , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] xfrm: Apply commit 4203223a1aed862b4445fdcd260d6139603a51d9 to 2.6.32 stable series Date: Tue, 6 Dec 2011 22:37:13 -0600 Message-Id: <1323232633-4307-1-git-send-email-jcalvinowens@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Calvin Owens This fix was applied to 3.0.3, but was not applied to earlier series. Distros based on this (Debian Squeeze, among others) likely haven't got it in, which prevents AES-CTR from being used for IPsec. Signed-off-by: Calvin Owens Signed-off-by: Calvin Owens --- 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 faf54c6..9bd850a 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -411,8 +411,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 } }, };