test_aesni: harmonize with AES-NI support at EVP layer.

[openssl.git] / test / test_aesni

diff --git a/test/test_aesni b/test/test_aesni
index e8fb63ee2bf45b8379924c5f979d5e85f351b3ea..3929c7574bba812e94c7699648d644f7e5b9829a 100755 (executable)
--- a/test/test_aesni
+++ b/test/test_aesni
@@ -14,14 +14,13 @@ else
     exit 1;
 fi
 
-if $PROG engine aesni | grep -v no-aesni; then
+if [ 1 ]; then
 
     HASH=`cat $PROG | $PROG dgst -hex`
 
-    AES_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"
+    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
@@ -30,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"
@@ -40,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"
@@ -49,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"