Add test for CLIENT_EARLY_TRAFFIC_SECRET key logging

[openssl.git] / test / bftest.c

diff --git a/test/bftest.c b/test/bftest.c
index df2c9a7af51ca532f4bdaa66a638f8c0394b6336..5abb81d7c911f856c6d07d06c0d2e09dd578a4a8 100644 (file)
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -16,10 +16,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
-
 #include "testutil.h"
 
-#include "../e_os.h"
+#include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_BF
 # include <openssl/blowfish.h>
@@ -357,7 +356,7 @@ static int test_bf_cbc(void)
     BF_set_key(&key, 16, cbc_key);
     memset(cbc_in, 0, sizeof(cbc_in));
     memset(cbc_out, 0, sizeof(cbc_out));
-    memcpy(iv, cbc_iv, sizeof iv);
+    memcpy(iv, cbc_iv, sizeof(iv));
     BF_cbc_encrypt((unsigned char *)cbc_data, cbc_out, len,
                    &key, iv, BF_ENCRYPT);
     if (!TEST_mem_eq(cbc_out, 32, cbc_ok, 32))
@@ -435,7 +434,7 @@ static int test_bf_ofb64(void)
 }
 #endif
 
-int test_main(int argc, char *argv[])
+int setup_tests(void)
 {
 #ifndef OPENSSL_NO_BF
 # ifdef CHARSET_EBCDIC
@@ -447,15 +446,16 @@ int test_main(int argc, char *argv[])
     }
 # endif
 
-    ADD_ALL_TESTS(test_bf_ecb_raw, 2);
-    ADD_ALL_TESTS(test_bf_ecb, NUM_TESTS);
-    ADD_ALL_TESTS(test_bf_set_key, KEY_TEST_NUM-1);
-    ADD_TEST(test_bf_cbc);
-    ADD_TEST(test_bf_cfb64);
-    ADD_TEST(test_bf_ofb64);
-
-    if (argc > 1)
-        return print_test_data();
+    if (test_get_argument(0) != NULL) {
+        print_test_data();
+    } else {
+        ADD_ALL_TESTS(test_bf_ecb_raw, 2);
+        ADD_ALL_TESTS(test_bf_ecb, NUM_TESTS);
+        ADD_ALL_TESTS(test_bf_set_key, KEY_TEST_NUM-1);
+        ADD_TEST(test_bf_cbc);
+        ADD_TEST(test_bf_cfb64);
+        ADD_TEST(test_bf_ofb64);
+    }
 #endif
-    return run_tests(argv[0]);
+    return 1;
 }