/*
- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
#include <string.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
-#include "../apps/apps.h"
+#include "apps_ui.h"
#include "testutil.h"
-/* apps/apps.c depend on these */
-char *default_config_file = 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
-
-void register_tests(void)
+int setup_tests(void)
{
-#ifndef OPENSSL_NO_UI
ADD_TEST(test_old);
ADD_TEST(test_new_ui);
-#endif
+ return 1;
}