Fix preprocessor indentation.

[openssl.git] / test / x509aux.c

diff --git a/test/x509aux.c b/test/x509aux.c
index 4f00196312b089069121482a89fc761cfd911ef3..44a9db1829105df2725b6c98230de699905455c9 100644 (file)
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -16,35 +16,14 @@
 #include <openssl/pem.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
+#include "e_os.h"
+#include "testutil.h"
 
-#include "../e_os.h"
 
-static const char *progname;
+/* List of files, from argv */
+static char **files;
 
-static void test_usage(void)
-{
-    fprintf(stderr, "usage: %s certfile\n", progname);
-}
-
-static void print_errors(void)
-{
-    unsigned long err;
-    char buffer[1024];
-    const char *file;
-    const char *data;
-    int line;
-    int flags;
-
-    while ((err = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0) {
-        ERR_error_string_n(err, buffer, sizeof(buffer));
-        if (flags & ERR_TXT_STRING)
-            fprintf(stderr, "Error: %s:%s:%d:%s\n", buffer, file, line, data);
-        else
-            fprintf(stderr, "Error: %s:%s:%d\n", buffer, file, line);
-    }
-}
-
-static int test_certs(BIO *fp)
+static int test_certs(int num)
 {
     int count;
     char *name = 0;
@@ -54,6 +33,10 @@ static int test_certs(BIO *fp)
     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");
+
+    if (!TEST_ptr(fp))
+        return 0;
 
     for (count = 0;
          !err && PEM_read_bio(fp, &name, &header, &data, &len);
@@ -163,6 +146,7 @@ static int test_certs(BIO *fp)
        OPENSSL_free(header);
        OPENSSL_free(data);
     }
+    BIO_free(fp);
 
     if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) {
         /* Reached end of PEM file */
@@ -173,54 +157,17 @@ static int test_certs(BIO *fp)
     }
 
     /* Some other PEM read error */
-    print_errors();
     return 0;
 }
 
-int main(int argc, char *argv[])
+int test_main(int argc, char *argv[])
 {
-    BIO *bio_err;
-    const char *certfile;
-    const char *p;
-    int ret = 1;
-
-    progname = argv[0];
     if (argc < 2) {
-        test_usage();
-        EXIT(ret);
-    }
-
-    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-
-    p = getenv("OPENSSL_DEBUG_MEMORY");
-    if (p != NULL && strcmp(p, "on") == 0)
-        CRYPTO_set_mem_debug(1);
-    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-    while ((certfile = *++argv) != NULL) {
-        BIO *f = BIO_new_file(certfile, "r");
-        int ok;
-
-        if (f == NULL) {
-            fprintf(stderr, "%s: Error opening cert file: '%s': %s\n",
-                    progname, certfile, strerror(errno));
-            EXIT(ret);
-        }
-        ret = !(ok = test_certs(f));
-        BIO_free(f);
-
-        if (!ok) {
-            printf("%s ERROR\n", certfile);
-            ret = 1;
-            break;
-        }
-        printf("%s OK\n", certfile);
+        TEST_error("usage: %s certfile...", argv[0]);
+        return 0;
     }
 
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
-    if (CRYPTO_mem_leaks(bio_err) <= 0)
-        ret = 1;
-#endif
-    BIO_free(bio_err);
-    EXIT(ret);
+    files = &argv[1];
+    ADD_ALL_TESTS(test_certs, argc - 1);
+    return run_tests(argv[0]);
 }