X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Fuitest.c;h=0000505a916dbf90fe997cd5c613402910ce73d1;hp=16d83b9528d6664c53a3592f6e7023146ac88681;hb=4afc60605abcf1ac8373838c71e94a131d29253e;hpb=027609f9563014a6f5bc6917f085bd77e8dc8dc7

diff --git a/test/uitest.c b/test/uitest.c
index 16d83b9528..0000505a91 100644
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -11,8 +11,25 @@
 #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"
 
@@ -42,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 */
@@ -56,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;
@@ -64,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);
 
@@ -89,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;
 }