diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-04-12 05:12:04 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-04-14 13:45:46 +0200 |
| commit | 4afc60605abcf1ac8373838c71e94a131d29253e (patch) | |
| tree | 147d5bd56daa3a731562df9373f4bbdd7ee24046 /test/uitest.c | |
| parent | Fix unit tests when no-bf configured (diff) | |
| download | openssl-4afc60605abcf1ac8373838c71e94a131d29253e.tar.xz openssl-4afc60605abcf1ac8373838c71e94a131d29253e.zip | |
WIP: Convert ui,v3ext,verify_extra_test
verify_extra_test still failing :(
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3194)
Diffstat (limited to 'test/uitest.c')
| -rw-r--r-- | test/uitest.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/test/uitest.c b/test/uitest.c index 0a7420d4d1..0000505a91 100644 --- a/test/uitest.c +++ b/test/uitest.c @@ -59,9 +59,9 @@ static int test_old() 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 */ @@ -73,7 +73,7 @@ static int test_old() 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; @@ -81,14 +81,10 @@ static int test_old() break; } - if (strcmp(pass, defpass) == 0) + if (TEST_str_eq(pass, defpass)) ok = 1; - else - BIO_printf(bio_err, "test_old: password failure\n"); err: - if (!ok) - ERR_print_errors_fp(stderr); UI_free(ui); UI_destroy_method(ui_method); @@ -106,15 +102,9 @@ static int test_new_ui() 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; - else - BIO_printf(bio_err, "test_new: password failure\n"); - - if (!ok) - ERR_print_errors_fp(stderr); - destroy_ui_method(); return ok; } |