From owner-svn-src-all@freebsd.org Mon Jul 13 15:26:03 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6453C99B37E; Mon, 13 Jul 2015 15:26:03 +0000 (UTC) (envelope-from gnn@freebsd.org) Received: from smtp.hungerhost.com (smtp.hungerhost.com [216.38.53.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E8B9A2B; Mon, 13 Jul 2015 15:26:02 +0000 (UTC) (envelope-from gnn@freebsd.org) Received: from [50.153.131.148] (port=22553 helo=[172.20.20.20]) by vps.hungerhost.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.85) (envelope-from ) id 1ZEfcF-0007f1-R5; Mon, 13 Jul 2015 11:25:59 -0400 From: "George Neville-Neil" To: "John-Mark Gurney" Cc: "Matthew D. Fuller" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r285336 - in head/sys: netipsec opencrypto Date: Mon, 13 Jul 2015 11:25:51 -0400 Message-ID: <815B402A-A14F-40F7-91CA-899C7A9597B3@freebsd.org> In-Reply-To: <20150711075705.GC8523@funkthat.com> References: <201507091816.t69IGawf097288@repo.freebsd.org> <20150711044843.GG96394@over-yonder.net> <20150711075705.GC8523@funkthat.com> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Mailer: MailMate (1.9.1r5084) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vps.hungerhost.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - freebsd.org X-Get-Message-Sender-Via: vps.hungerhost.com: authenticated_id: gnn@neville-neil.com X-Source: X-Source-Args: X-Source-Dir: X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2015 15:26:03 -0000 On 11 Jul 2015, at 3:57, John-Mark Gurney wrote: > Matthew D. Fuller wrote this message on Fri, Jul 10, 2015 at 23:48 > -0500: >> On Thu, Jul 09, 2015 at 06:16:36PM +0000 I heard the voice of >> George V. Neville-Neil, and lo! it spake thus: >>> New Revision: 285336 >>> URL: https://svnweb.freebsd.org/changeset/base/285336 >>> >>> Log: >>> Add support for AES modes to IPSec. These modes work both in >>> software only >>> mode and with hardware support on systems that have AESNI >>> instructions. >> >> With (apparently) this change, I can trigger a panic at will by >> running >> >> % geli onetime -e AES-XTS -d /dev/ada0s1 >> >> My best guess is that it comes from >> >>> -#define RIJNDAEL128_BLOCK_LEN 16 >>> +#define AES_MIN_BLOCK_LEN 1 >> >>> - RIJNDAEL128_BLOCK_LEN, 8, 32, 64, >>> + AES_MIN_BLOCK_LEN, AES_XTS_IV_LEN, AES_XTS_MIN_KEY, >>> AES_XTS_MAX_KEY, >> >> changing that first arg from 16 to 1. It seems to be avoided with >> the >> following patch: >> >> ------8K-------- >> >> Index: sys/opencrypto/xform.c >> =================================================================== >> --- sys/opencrypto/xform.c (revision 285365) >> +++ sys/opencrypto/xform.c (working copy) >> @@ -257,7 +257,7 @@ >> >> struct enc_xform enc_xform_aes_xts = { >> CRYPTO_AES_XTS, "AES-XTS", >> - AES_MIN_BLOCK_LEN, AES_XTS_IV_LEN, AES_XTS_MIN_KEY, >> AES_XTS_MAX_KEY, >> + AES_BLOCK_LEN, AES_XTS_IV_LEN, AES_XTS_MIN_KEY, AES_XTS_MAX_KEY, >> aes_xts_encrypt, >> aes_xts_decrypt, >> aes_xts_setkey, >> >> ------8K-------- >> >> at least in a little testing here. If that's the actual fix, some of >> the other MIN_BLOCK_LEN changes in GCM and GMAC are probably suspect >> too. >> >> >> (I also wonder why AES-ICM is still using the RIJNDAEL128 #defines; >> shouldn't it be using the AES's too? But that's cosmtic...) > > Our XTS though should be a block size of 1, doesn't implement > cipher text stealing, so still must be 16... I assumed that the values > of all the defines did not change... That is clearly not the case... > > gnn, can you please make sure that the tables in xform.c match before > your change? If you think there needs to be a value changed, please > run it by me.. > Correct, I changed it from the RIJNDAEL value to the "correct" minimum value of 1. I can do a followup commit to bump it back to 16 if that's what you think it ought to be. Best, George