From owner-freebsd-current@FreeBSD.ORG Wed Mar 2 15:44:32 2011 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 561B1106566B for ; Wed, 2 Mar 2011 15:44:32 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id E0AB58FC0C for ; Wed, 2 Mar 2011 15:44:31 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p22FJjDo064893 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 2 Mar 2011 17:19:45 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p22FJj65040484; Wed, 2 Mar 2011 17:19:45 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p22FJjOZ040483; Wed, 2 Mar 2011 17:19:45 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 2 Mar 2011 17:19:45 +0200 From: Kostik Belousov To: current@freebsd.org, stable@freebsd.org Message-ID: <20110302151945.GC78089@deviant.kiev.zoral.com.ua> References: <201103021456.p22EuwNf016650@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4FwjdDQe+x6SiBx9" Content-Disposition: inline In-Reply-To: <201103021456.p22EuwNf016650@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: Subject: Re: svn commit: r219178 - head/sys/crypto/aesni X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2011 15:44:32 -0000 --4FwjdDQe+x6SiBx9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 02, 2011 at 02:56:58PM +0000, Konstantin Belousov wrote: > Author: kib > Date: Wed Mar 2 14:56:58 2011 > New Revision: 219178 > URL: http://svn.freebsd.org/changeset/base/219178 >=20 > Log: > Fix a bug in the result of manual assembly. > =20 > Reported by: Stefan Grundmann > PR: kern/155118 > MFC after: 3 days The end result of this bug should affect only AES256 variants, causing wrong keyschedule calculation. If you have a geli partition with 256bit key that worked with previous version of aesni(4), best strategy is backup, reinitialize geli volume with the new driver, then restore. Sorry. >=20 > Modified: > head/sys/crypto/aesni/aeskeys_amd64.S > head/sys/crypto/aesni/aeskeys_i386.S >=20 > Modified: head/sys/crypto/aesni/aeskeys_amd64.S > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/crypto/aesni/aeskeys_amd64.S Wed Mar 2 14:39:26 2011 (r2191= 77) > +++ head/sys/crypto/aesni/aeskeys_amd64.S Wed Mar 2 14:56:58 2011 (r2191= 78) > @@ -162,7 +162,7 @@ ENTRY(aesni_set_enckey) > .byte 0x66,0x0f,0x3a,0xdf,0xc8,0x20 > call _key_expansion_256b > // aeskeygenassist $0x40,%xmm2,%xmm1 # round 7 > - .byte 0x66,0x0f,0x3a,0xdf,0xca,0x20 > + .byte 0x66,0x0f,0x3a,0xdf,0xca,0x40 > call _key_expansion_256a > retq > .Lenc_key192: >=20 > Modified: head/sys/crypto/aesni/aeskeys_i386.S > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/crypto/aesni/aeskeys_i386.S Wed Mar 2 14:39:26 2011 (r21917= 7) > +++ head/sys/crypto/aesni/aeskeys_i386.S Wed Mar 2 14:56:58 2011 (r21917= 8) > @@ -167,7 +167,7 @@ ENTRY(aesni_set_enckey) > .byte 0x66,0x0f,0x3a,0xdf,0xc8,0x20 > call _key_expansion_256b > // aeskeygenassist $0x40,%xmm2,%xmm1 # round 7 > - .byte 0x66,0x0f,0x3a,0xdf,0xca,0x20 > + .byte 0x66,0x0f,0x3a,0xdf,0xca,0x40 > call _key_expansion_256a > .cfi_adjust_cfa_offset -4 > leave --4FwjdDQe+x6SiBx9 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk1uYBAACgkQC3+MBN1Mb4g7cQCcCBJiEGwEbfHJErv1Ux7joFQy PqcAoOOB5A57jmCcbt/VbTMKN9cddAlf =aNlH -----END PGP SIGNATURE----- --4FwjdDQe+x6SiBx9--