提交 027609f9 编写于 作者: R Richard Levitte

UI: fix uitest for no-ui configuration

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2218)
上级 928933f9
......@@ -9,8 +9,8 @@
#include <stdio.h>
#include <string.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
#include <openssl/ui.h>
#include "../apps/apps.h"
#include "testutil.h"
......@@ -20,6 +20,9 @@
char *default_config_file = NULL;
BIO *bio_err = NULL;
#ifndef OPENSSL_NO_UI
# include <openssl/ui.h>
/* Old style PEM password callback */
static int test_pem_password_cb(char *buf, int size, int rwflag, void *userdata)
{
......@@ -99,14 +102,18 @@ static int test_new_ui()
return ok;
}
#endif
int test_main(int argc, char *argv[])
{
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]);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册