Rewrite RAND_egd

[openssl.git] / test / uitest.c

diff --git a/test/uitest.c b/test/uitest.c
index 0000505a916dbf90fe997cd5c613402910ce73d1..6fef137b02681e29436a9d5cdfe9f99e0685ab5e 100644 (file)
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -11,40 +11,19 @@
 #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 "apps.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 /* apps/apps.c depend on these */
 char *default_config_file = NULL;
-BIO *bio_err = NULL;
 
-#ifndef OPENSSL_NO_UI
-# include <openssl/ui.h>
+#include <openssl/ui.h>
 
 /* Old style PEM password callback */
 static int test_pem_password_cb(char *buf, int size, int rwflag, void *userdata)
 {
     OPENSSL_strlcpy(buf, (char *)userdata, (size_t)size);
-    return 1;
+    return strlen(buf);
 }
 
 /*
@@ -109,23 +88,8 @@ static int test_new_ui()
     return ok;
 }
 
-#endif
-
-int test_main(int argc, char *argv[])
+void register_tests(void)
 {
-    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]);
-
-    (void)BIO_flush(bio_err);
-    BIO_free(bio_err);
-
-    return ret;
 }