From owner-svn-src-stable@FreeBSD.ORG  Sat Mar  5 09:42:01 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5AE281065675;
	Sat,  5 Mar 2011 09:42:01 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 49A268FC0C;
	Sat,  5 Mar 2011 09:42:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p259g1Mr030940;
	Sat, 5 Mar 2011 09:42:01 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p259g1wW030937;
	Sat, 5 Mar 2011 09:42:01 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201103050942.p259g1wW030937@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 5 Mar 2011 09:42:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219303 - stable/8/sys/crypto/aesni
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Mar 2011 09:42:01 -0000

Author: kib
Date: Sat Mar  5 09:42:00 2011
New Revision: 219303
URL: http://svn.freebsd.org/changeset/base/219303

Log:
  MFC r219178:
  Fix a bug in the result of manual assembly.
  
  PR:	kern/155118

Modified:
  stable/8/sys/crypto/aesni/aeskeys_amd64.S
  stable/8/sys/crypto/aesni/aeskeys_i386.S
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/crypto/aesni/aeskeys_amd64.S
==============================================================================
--- stable/8/sys/crypto/aesni/aeskeys_amd64.S	Sat Mar  5 08:56:42 2011	(r219302)
+++ stable/8/sys/crypto/aesni/aeskeys_amd64.S	Sat Mar  5 09:42:00 2011	(r219303)
@@ -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:

Modified: stable/8/sys/crypto/aesni/aeskeys_i386.S
==============================================================================
--- stable/8/sys/crypto/aesni/aeskeys_i386.S	Sat Mar  5 08:56:42 2011	(r219302)
+++ stable/8/sys/crypto/aesni/aeskeys_i386.S	Sat Mar  5 09:42:00 2011	(r219303)
@@ -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