X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Ftest_aesni;h=3929c7574bba812e94c7699648d644f7e5b9829a;hp=87f5da191e6ce279cef225d5cf7e1105e8152b78;hb=16a9542a1723828c5b2dbe854a2864aa3ed2b11e;hpb=eda2da323524e0f94b96531e386e412a18356d67

diff --git a/test/test_aesni b/test/test_aesni
index 87f5da191e..3929c7574b 100755
--- a/test/test_aesni
+++ b/test/test_aesni
@@ -14,28 +14,23 @@ else
     exit 1;
 fi
 
-if $PROG engine aesni | grep aesni; then
+if [ 1 ]; then
 
     HASH=`cat $PROG | $PROG dgst -hex`
 
-    ACE_ALGS="	aes-128-ecb aes-192-ecb aes-256-ecb \
-		aes-128-cbc aes-192-cbc aes-256-cbc \
-		aes-128-cfb aes-192-cfb aes-256-cfb \
-		aes-128-ofb aes-192-ofb aes-256-ofb"
-    BUFSIZE="16 32 48 64 80 96 128 999"
-    ACE_ALGS="	aes-128-cbc aes-192-cbc aes-256-cbc \
-		aes-128-cfb aes-192-cfb aes-256-cfb \
-		aes-128-ofb aes-192-ofb aes-256-ofb"
-    BUFSIZE="48 64 80 96 128 999"
+    AES_ALGS="	aes-128-ctr aes-128-ecb aes-128-cbc aes-128-cfb aes-128-ofb \
+		aes-192-ctr aes-192-ecb aes-192-cbc aes-192-cfb aes-192-ofb \
+		aes-256-ctr aes-256-ecb aes-256-cbc aes-256-cfb aes-256-ofb"
+    BUFSIZE="16 32 48 64 80 96 128 144 999"
 
     nerr=0
 
-    for alg in $ACE_ALGS; do
+    for alg in $AES_ALGS; do
 	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"
@@ -44,8 +39,8 @@ if $PROG engine aesni | grep 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"
@@ -53,8 +48,8 @@ if $PROG engine aesni | grep 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"