Fix AEAD tests.

SKEY_SUPPORT is not defined for the test sources, use an OpenSSL macro
instead.

Moreover, tokens may support only a subset of AEAD algorithms, so skip
algorithms that are not available.

Signed-off-by: Ilie Halip <ilie.halip@nxp.com>

Author: ilie-halip-nxp

tests/taead

@@ -23,14 +23,19 @@ ALGORITHMS=(
     AES-128-GCM
     AES-192-GCM
     AES-256-GCM
-    CHACHA20-POLY1305
+    ChaCha20-Poly1305
 )
 
 title PARA "Test AEAD support"
 
 for alg in "${ALGORITHMS[@]}"; do
     echo "Checking algorithm $alg"
-    $CHECKER "${TESTBLDDIR}/taead" "$alg" "$KEY" "$IV" "$AAD" "$DATA"
+    if $OPENSSL list -cipher-algorithms 2>/dev/null | grep -q "$alg"; then
+        title PARA "Run AEAD test with $alg"
+        $CHECKER "${TESTBLDDIR}/taead" "$alg" "$KEY" "$IV" "$AAD" "$DATA"
+    else
+        title PARA "Skipping AEAD test with $alg"
+    fi
 done
 
 echo "PASSED"

tests/taead.c

@@ -12,7 +12,7 @@
 #include <openssl/core_names.h>
 #include "util.h"
 
-#if SKEY_SUPPORT == 1
+#if defined(OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT)
 
 #define MAX_DATA_LEN 1024
 
@@ -271,7 +271,7 @@ int main(int argc, char *argv[])
                 argv[0]);
         fprintf(stderr,
                 "    Algorithms: AES-128-GCM, AES-192-GCM, AES-256-GCM,\n"
-                "                CHACHA20-POLY1305\n");
+                "                ChaCha20-Poly1305\n");
         exit(EXIT_FAILURE);
     }