Date: Wed, 2 Mar 2011 17:19:45 +0200 From: Kostik Belousov <kostikbel@gmail.com> To: current@freebsd.org, stable@freebsd.org Subject: Re: svn commit: r219178 - head/sys/crypto/aesni Message-ID: <20110302151945.GC78089@deviant.kiev.zoral.com.ua> In-Reply-To: <201103021456.p22EuwNf016650@svn.freebsd.org> References: <201103021456.p22EuwNf016650@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <sg2342 googlemail com> > 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110302151945.GC78089>