From owner-p4-projects@FreeBSD.ORG  Fri Sep 19 06:46:44 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id B16C84DB; Fri, 19 Sep 2014 06:46:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 744644D9
 for <perforce@freebsd.org>; Fri, 19 Sep 2014 06:46:44 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (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 5FDC791
 for <perforce@freebsd.org>; Fri, 19 Sep 2014 06:46:44 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8J6kiue012990
 for <perforce@freebsd.org>; Fri, 19 Sep 2014 06:46:44 GMT
 (envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8J6kiFA012987
 for perforce@freebsd.org; Fri, 19 Sep 2014 06:46:44 GMT
 (envelope-from jmg@freebsd.org)
Date: Fri, 19 Sep 2014 06:46:44 GMT
Message-Id: <201409190646.s8J6kiFA012987@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Subject: PERFORCE change 1200500 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Sep 2014 06:46:44 -0000

http://p4web.freebsd.org/@@1200500?ac=10

Change 1200500 by jmg@jmg_carbon2 on 2014/09/19 06:46:28

	fix up $Id$ to be $FreeBSD$
	
	I've confirmed with Shay that the code was broken, so no need to
	keep it around anymore...
	
	Sponsored by:	FreeBSD Foundation
	Sponsored by:	Rubicon Communications, LLC (Netgate)

Affected files ...

.. //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#3 edit

Differences ...

==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_ghash.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$Id$
+ *	$FreeBSD$
  *
  */
 
@@ -658,12 +658,7 @@
 	X = _mm_shuffle_epi8(X, BSWAP_MASK);
 	T = _mm_xor_si128(X, T);
 
-#if 0
-	/* XXX - broken Intel code */
-	if (_mm_testz_si128(T, _mm_loadu_si128((__m128i*)tag)))
-#else
 	if (!m128icmp(T, _mm_loadu_si128((__m128i*)tag)))
-#endif
 		return 0; //in case the authentication failed
 
 	ctr1 = _mm_shuffle_epi8(Y, BSWAP_EPI64);