projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP: Convert ui,v3ext,verify_extra_test
[openssl.git]
/
test
/
uitest.c
diff --git
a/test/uitest.c
b/test/uitest.c
index 0a7420d4d1ae0d8806af59c2ab128f858973c58b..0000505a916dbf90fe997cd5c613402910ce73d1 100644
(file)
--- a/
test/uitest.c
+++ b/
test/uitest.c
@@
-59,9
+59,9
@@
static int test_old()
char pass[16];
int ok = 0;
char pass[16];
int ok = 0;
- if ((ui_method =
- UI_UTIL_wrap_read_pem_callback(test_pem_password_cb, 0)) == NULL
-
|| (ui = UI_new_method(ui_method)) == NULL
)
+ if (
!TEST_ptr
(ui_method =
+ UI_UTIL_wrap_read_pem_callback( test_pem_password_cb, 0))
+
|| !TEST_ptr(ui = UI_new_method(ui_method))
)
goto err;
/* The wrapper passes the UI userdata as the callback userdata param */
goto err;
/* The wrapper passes the UI userdata as the callback userdata param */
@@
-73,7
+73,7
@@
static int test_old()
switch (UI_process(ui)) {
case -2:
switch (UI_process(ui)) {
case -2:
-
BIO_printf(bio_err, "test_old: UI process interrupted or cancelled\n
");
+
TEST_info("test_old: UI process interrupted or cancelled
");
/* fall through */
case -1:
goto err;
/* fall through */
case -1:
goto err;
@@
-81,14
+81,10
@@
static int test_old()
break;
}
break;
}
- if (
strcmp(pass, defpass) == 0
)
+ if (
TEST_str_eq(pass, defpass)
)
ok = 1;
ok = 1;
- else
- BIO_printf(bio_err, "test_old: password failure\n");
err:
err:
- if (!ok)
- ERR_print_errors_fp(stderr);
UI_free(ui);
UI_destroy_method(ui_method);
UI_free(ui);
UI_destroy_method(ui_method);
@@
-106,15
+102,9
@@
static int test_new_ui()
int ok = 0;
setup_ui_method();
int ok = 0;
setup_ui_method();
- if (
password_callback(pass, sizeof(pass), 0, &cb_data) > 0
-
&& strcmp(pass, cb_data.password) == 0
)
+ if (
TEST_int_gt(password_callback(pass, sizeof(pass), 0, &cb_data), 0)
+
&& TEST_str_eq(pass, cb_data.password)
)
ok = 1;
ok = 1;
- else
- BIO_printf(bio_err, "test_new: password failure\n");
-
- if (!ok)
- ERR_print_errors_fp(stderr);
-
destroy_ui_method();
return ok;
}
destroy_ui_method();
return ok;
}