Updates following review of SSL_stateless() code

[openssl.git] / test / x509aux.c

diff --git a/test/x509aux.c b/test/x509aux.c
index 024bfc9004bb0c15b6880a8e1deb81bed1a74b6f..b66e1de71ae07df8a18177c40f098f429798b1f3 100644 (file)
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -16,16 +16,12 @@
 #include <openssl/pem.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
-#include "e_os.h"
+#include "internal/nelem.h"
 #include "testutil.h"
 
-
-/* List of files, from argv */
-static char **files;
-
 static int test_certs(int num)
 {
-    int count;
+    int c;
     char *name = 0;
     char *header = 0;
     unsigned char *data = 0;
@@ -33,15 +29,14 @@ static int test_certs(int num)
     typedef X509 *(*d2i_X509_t)(X509 **, const unsigned char **, long);
     typedef int (*i2d_X509_t)(X509 *, unsigned char **);
     int err = 0;
-    BIO *fp = BIO_new_file(files[num], "r");
+    BIO *fp = BIO_new_file(test_get_argument(num), "r");
 
     if (!TEST_ptr(fp))
         return 0;
 
-    for (count = 0;
-         !err && PEM_read_bio(fp, &name, &header, &data, &len);
-         ++count) {
-        int trusted = strcmp(name, PEM_STRING_X509_TRUSTED) == 0;
+    for (c = 0; !err && PEM_read_bio(fp, &name, &header, &data, &len); ++c) {
+        const int trusted = (strcmp(name, PEM_STRING_X509_TRUSTED) == 0);
+
         d2i_X509_t d2i = trusted ? d2i_X509_AUX : d2i_X509;
         i2d_X509_t i2d = trusted ? i2d_X509_AUX : i2d_X509;
         X509 *cert = NULL;
@@ -147,7 +142,7 @@ static int test_certs(int num)
 
     if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) {
         /* Reached end of PEM file */
-        if (count > 0) {
+        if (c > 0) {
             ERR_clear_error();
             return 1;
         }
@@ -157,14 +152,15 @@ static int test_certs(int num)
     return 0;
 }
 
-int test_main(int argc, char *argv[])
+int setup_tests(void)
 {
-    if (argc < 2) {
-        TEST_error("usage: %s certfile...", argv[0]);
+    size_t n = test_get_argument_count();
+
+    if (n == 0) {
+        TEST_error("usage: %s certfile...", test_get_program_name());
         return 0;
     }
 
-    files = &argv[1];
-    ADD_ALL_TESTS(test_certs, argc - 1);
-    return run_tests(argv[0]);
+    ADD_ALL_TESTS(test_certs, n);
+    return 1;
 }