Convert afalgtest

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3229)

diff --git a/test/afalgtest.c b/test/afalgtest.c
index 7fc03ba147084cd6e12ba8d886f95417de659b48..cae3053cad25cc14bb501cc7510c6e4ecac4ae2a 100644 (file)
--- a/test/afalgtest.c
+++ b/test/afalgtest.c
@@ -27,15 +27,19 @@
 #endif
 
 #ifndef OPENSSL_NO_AFALGENG
+/* #if 1 */
 #include <string.h>
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
+#include "testutil.h"
 
 /* Use a buffer size which is not aligned to block size */
 #define BUFFER_SIZE     (8 * 1024) - 13
 
-static int test_afalg_aes_128_cbc(ENGINE *e)
+static ENGINE *e;
+
+static int test_afalg_aes_128_cbc(void)
 {
     EVP_CIPHER_CTX *ctx;
     const EVP_CIPHER *cipher = EVP_aes_128_cbc();
@@ -48,77 +52,57 @@ static int test_afalg_aes_128_cbc(ENGINE *e)
     unsigned char ebuf[BUFFER_SIZE + 32];
     unsigned char dbuf[BUFFER_SIZE + 32];
     int encl, encf, decl, decf;
-    unsigned int status = 0;
+    int ret = 0;
 
-    ctx = EVP_CIPHER_CTX_new();
-    if (ctx == NULL) {
-        fprintf(stderr, "%s() failed to allocate ctx\n", __func__);
-        return 0;
-    }
+    if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new()))
+            return 0;
     RAND_bytes(in, BUFFER_SIZE);
 
-    if (       !EVP_CipherInit_ex(ctx, cipher, e, key, iv, 1)
-            || !EVP_CipherUpdate(ctx, ebuf, &encl, in, BUFFER_SIZE)
-            || !EVP_CipherFinal_ex(ctx, ebuf+encl, &encf)) {
-        fprintf(stderr, "%s() failed encryption\n", __func__);
+    if (!TEST_true(EVP_CipherInit_ex(ctx, cipher, e, key, iv, 1))
+            || !TEST_true(EVP_CipherUpdate(ctx, ebuf, &encl, in, BUFFER_SIZE))
+            || !TEST_true(EVP_CipherFinal_ex(ctx, ebuf+encl, &encf)))
         goto end;
-    }
     encl += encf;
 
-    if (       !EVP_CIPHER_CTX_reset(ctx)
-            || !EVP_CipherInit_ex(ctx, cipher, e, key, iv, 0)
-            || !EVP_CipherUpdate(ctx, dbuf, &decl, ebuf, encl)
-            || !EVP_CipherFinal_ex(ctx, dbuf+decl, &decf)) {
-        fprintf(stderr, "%s() failed decryption\n", __func__);
+    if (!TEST_true(EVP_CIPHER_CTX_reset(ctx))
+            || !TEST_true(EVP_CipherInit_ex(ctx, cipher, e, key, iv, 0))
+            || !TEST_true(EVP_CipherUpdate(ctx, dbuf, &decl, ebuf, encl))
+            || !TEST_true(EVP_CipherFinal_ex(ctx, dbuf+decl, &decf)))
         goto end;
-    }
     decl += decf;
 
-    if (       decl != BUFFER_SIZE
-            || memcmp(dbuf, in, BUFFER_SIZE)) {
-        fprintf(stderr, "%s() failed Dec(Enc(P)) != P\n", __func__);
+    if (!TEST_int_eq(decl, BUFFER_SIZE)
+            || !TEST_mem_eq(dbuf, BUFFER_SIZE, in, BUFFER_SIZE))
         goto end;
-    }
 
-    status = 1;
+    ret = 1;
 
  end:
     EVP_CIPHER_CTX_free(ctx);
-    return status;
+    return ret;
 }
 
 int main(int argc, char **argv)
 {
-    ENGINE *e;
-
-    CRYPTO_set_mem_debug(1);
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+    int ret = 0;
 
     ENGINE_load_builtin_engines();
-
 # ifndef OPENSSL_NO_STATIC_ENGINE
     OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL);
 # endif
 
-    e = ENGINE_by_id("afalg");
-    if (e == NULL) {
-        /*
-         * A failure to load is probably a platform environment problem so we
-         * don't treat this as an OpenSSL test failure, i.e. we return 0
-         */
-        fprintf(stderr,
-                "AFALG Test: Failed to load AFALG Engine - skipping test\n");
-        return 0;
-    }
+    setup_test();
 
-    if (test_afalg_aes_128_cbc(e) == 0) {
-        ENGINE_free(e);
-        return 1;
+    if ((e = ENGINE_by_id("afalg")) == NULL) {
+        /* Probably a platform env issue, not a test failure. */
+        TEST_info("Can't load AFALG engine");
+    } else {
+        ADD_TEST(test_afalg_aes_128_cbc);
     }
+    ret = run_tests(argv[0]);
 
     ENGINE_free(e);
-    printf("PASS\n");
-    return 0;
+    return finish_test(ret);
 }
 
 #else  /* OPENSSL_NO_AFALGENG */