/*
- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
#include <string.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
-
-/*
- * The VMS build does stdio via a socketpair.
- */
-#ifdef __VMS
-# include "../apps/vms_term_sock.h"
-#endif
-
-#include "../apps/apps.h"
-
+#include "apps.h"
#include "testutil.h"
-#include "test_main_custom.h"
/* apps/apps.c depend on these */
char *default_config_file = NULL;
-BIO *bio_err = NULL;
-#ifndef OPENSSL_NO_UI
-# include <openssl/ui.h>
+#include <openssl/ui.h>
/* Old style PEM password callback */
static int test_pem_password_cb(char *buf, int size, int rwflag, void *userdata)
{
OPENSSL_strlcpy(buf, (char *)userdata, (size_t)size);
- return 1;
+ return strlen(buf);
}
/*
* Test wrapping old style PEM password callback in a UI method through the
* use of UI utility functions
*/
-static int test_old()
+static int test_old(void)
{
UI_METHOD *ui_method = NULL;
UI *ui = NULL;
}
/* Test of UI. This uses the UI method defined in apps/apps.c */
-static int test_new_ui()
+static int test_new_ui(void)
{
PW_CB_DATA cb_data = {
"password",
return ok;
}
-#endif
-
-int test_main(int argc, char *argv[])
+int setup_tests(void)
{
- int ret;
-
- bio_err = dup_bio_err(FORMAT_TEXT);
-
-#ifndef OPENSSL_NO_UI
ADD_TEST(test_old);
ADD_TEST(test_new_ui);
-#endif
-
- ret = run_tests(argv[0]);
-
- (void)BIO_flush(bio_err);
- BIO_free(bio_err);
-
- return ret;
+ return 1;
}