From 799379215e2dad7c85015dad899fde2f6461edfc Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Sun, 15 Jul 2012 13:38:51 +0000
Subject: [PATCH] test_aesni: harmonize with AES-NI support at EVP layer.

---
 test/test_aesni | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/test_aesni b/test/test_aesni
index 8c201bc132..3929c7574b 100755
--- a/test/test_aesni
+++ b/test/test_aesni
@@ -14,7 +14,7 @@ else
     exit 1;
 fi
 
-if $PROG engine aesni | grep -v no-aesni; then
+if [ 1 ]; then
 
     HASH=`cat $PROG | $PROG dgst -hex`
 
@@ -29,8 +29,8 @@ if $PROG engine aesni | grep -v no-aesni; then
 	echo $alg
 	for bufsize in $BUFSIZE; do
 	    TEST=`(	cat $PROG | \
-		$PROG enc -e -k "$HASH" -$alg -bufsize $bufsize -engine aesni | \
-		$PROG enc -d -k "$HASH" -$alg | \
+		$PROG enc -e -k "$HASH" -$alg -bufsize $bufsize | \
+		env OPENSSL_ia32cap=~0x0200000000000000 $PROG enc -d -k "$HASH" -$alg | \
 		$PROG dgst -hex ) 2>/dev/null`
 	    if [ "$TEST" != "$HASH" ]; then
 		echo "-$alg/$bufsize encrypt test failed"
@@ -39,8 +39,8 @@ if $PROG engine aesni | grep -v no-aesni; then
 	done
 	for bufsize in $BUFSIZE; do 
 	    TEST=`(	cat $PROG | \
-		$PROG enc -e -k "$HASH" -$alg | \
-		$PROG enc -d -k "$HASH" -$alg -bufsize $bufsize -engine aesni | \
+		env OPENSSL_ia32cap=~0x0200000000000000 $PROG enc -e -k "$HASH" -$alg | \
+		$PROG enc -d -k "$HASH" -$alg -bufsize $bufsize | \
 		$PROG dgst -hex ) 2>/dev/null`
 	    if [ "$TEST" != "$HASH" ]; then
 		echo "-$alg/$bufsize decrypt test failed"
@@ -48,8 +48,8 @@ if $PROG engine aesni | grep -v no-aesni; then
 	    fi
 	done
 	TEST=`(	cat $PROG | \
-		$PROG enc -e -k "$HASH" -$alg -engine aesni | \
-		$PROG enc -d -k "$HASH" -$alg -engine aesni | \
+		$PROG enc -e -k "$HASH" -$alg | \
+		$PROG enc -d -k "$HASH" -$alg | \
 		$PROG dgst -hex ) 2>/dev/null`
 	if [ "$TEST" != "$HASH" ]; then
 		echo "-$alg en/decrypt test failed"
-- 
2.34.1