#include <string.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
+
+/*
+ * We know that on VMS, the [.apps] object files are compiled with uppercased
+ * symbols. We must therefore follow suit, or there will be linking errors.
+ * Additionally, the VMS build does stdio via a socketpair.
+ */
+#ifdef __VMS
+# pragma names save
+# pragma names uppercase, truncated
+
+# include "../apps/vms_term_sock.h"
+#endif
+
#include "../apps/apps.h"
+#ifdef __VMS
+# pragma names restore
+#endif
+
#include "testutil.h"
#include "test_main_custom.h"
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 */
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;
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);
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;
}