Make sure we trigger retransmits in DTLS testing

[openssl.git] / test / uitest.c

diff --git a/test/uitest.c b/test/uitest.c
index 469e2304f8b31f9057675ccc5746d321c32e9b2e..ba40f52dcdc88032a8b032695b561b00a1cd78ec 100644 (file)
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -17,8 +17,7 @@
 /* apps/apps.c depend on these */
 char *default_config_file = 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)
@@ -31,7 +30,7 @@ static int test_pem_password_cb(char *buf, int size, int rwflag, void *userdata)
  * Test wrapping old style PEM password callback in a UI method through the
  * use of UI utility functions
  */
-static int test_old()
+static int test_old(void)
 {
     UI_METHOD *ui_method = NULL;
     UI *ui = NULL;
@@ -72,7 +71,7 @@ static int test_old()
 }
 
 /* Test of UI.  This uses the UI method defined in apps/apps.c */
-static int test_new_ui()
+static int test_new_ui(void)
 {
     PW_CB_DATA cb_data = {
         "password",
@@ -89,12 +88,9 @@ static int test_new_ui()
     return ok;
 }
 
-#endif
-
-void register_tests(void)
+int setup_tests(void)
 {
-#ifndef OPENSSL_NO_UI
     ADD_TEST(test_old);
     ADD_TEST(test_new_ui);
-#endif
+    return 1;
 }