From 31a80694d425bf7f3a0ed5cc2ee775d9418a5490 Mon Sep 17 00:00:00 2001
From: FdaSilvaYY <fdasilvayy@gmail.com>
Date: Tue, 15 Aug 2017 23:39:03 +0200
Subject: [PATCH 1/1] [Win] Fix some test method signatures ...

to halves MSVC warnings.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4172)
---
 test/asn1_string_table_test.c       |  2 +-
 test/bntest.c                       | 48 ++++++++++++++---------------
 test/cipherlist_test.c              |  4 +--
 test/ciphername_test.c              |  2 +-
 test/d2i_test.c                     |  2 +-
 test/danetest.c                     |  2 +-
 test/drbgtest.c                     |  2 +-
 test/ecdsatest.c                    |  2 +-
 test/ecstresstest.c                 |  2 +-
 test/exptest.c                      |  2 +-
 test/hmactest.c                     |  8 ++---
 test/packettest.c                   | 46 +++++++++++++--------------
 test/pkey_meth_test.c               |  2 +-
 test/servername_test.c              |  6 ++--
 test/ssl_cert_table_internal_test.c |  2 +-
 test/ssl_test_ctx_test.c            |  4 +--
 test/uitest.c                       |  4 +--
 test/x509_time_test.c               |  2 +-
 18 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/test/asn1_string_table_test.c b/test/asn1_string_table_test.c
index 291341464e..3c6cc257bc 100644
--- a/test/asn1_string_table_test.c
+++ b/test/asn1_string_table_test.c
@@ -15,7 +15,7 @@
 #include <openssl/asn1.h>
 #include "testutil.h"
 
-static int test_string_tbl()
+static int test_string_tbl(void)
 {
     const ASN1_STRING_TABLE *tmp = NULL;
     int nid = 12345678, nid2 = 87654321, rv = 0, ret = 0;
diff --git a/test/bntest.c b/test/bntest.c
index ca0b8e3648..f32b308d0c 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -150,7 +150,7 @@ static int rand_neg(void)
 }
 
 
-static int test_sub()
+static int test_sub(void)
 {
     BIGNUM *a = NULL, *b = NULL, *c = NULL;
     int i, st = 0;
@@ -187,7 +187,7 @@ err:
 }
 
 
-static int test_div_recip()
+static int test_div_recip(void)
 {
     BIGNUM *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL;
     BN_RECP_CTX *recp = NULL;
@@ -231,7 +231,7 @@ err:
 }
 
 
-static int test_mod()
+static int test_mod(void)
 {
     BIGNUM *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL;
     int st = 0, i;
@@ -323,7 +323,7 @@ static char *glue(const char *list[])
  * Test constant-time modular exponentiation with 1024-bit inputs, which on
  * x86_64 cause a different code branch to be taken.
  */
-static int test_modexp_mont5()
+static int test_modexp_mont5(void)
 {
     BIGNUM *a = NULL, *p = NULL, *m = NULL, *d = NULL, *e = NULL;
     BIGNUM *b = NULL, *n = NULL, *c = NULL;
@@ -431,7 +431,7 @@ err:
 }
 
 #ifndef OPENSSL_NO_EC2M
-static int test_gf2m_add()
+static int test_gf2m_add(void)
 {
     BIGNUM *a = NULL, *b = NULL, *c = NULL;
     int i, st = 0;
@@ -464,7 +464,7 @@ static int test_gf2m_add()
     return st;
 }
 
-static int test_gf2m_mod()
+static int test_gf2m_mod(void)
 {
     BIGNUM *a = NULL, *b[2] = {NULL,NULL}, *c = NULL, *d = NULL, *e = NULL;
     int i, j, st = 0;
@@ -502,7 +502,7 @@ static int test_gf2m_mod()
     return st;
 }
 
-static int test_gf2m_mul()
+static int test_gf2m_mul(void)
 {
     BIGNUM *a, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL, *g = NULL, *h = NULL;
@@ -553,7 +553,7 @@ static int test_gf2m_mul()
     return st;
 }
 
-static int test_gf2m_sqr()
+static int test_gf2m_sqr(void)
 {
     BIGNUM *a = NULL, *b[2] = {NULL,NULL}, *c = NULL, *d = NULL;
     int i, j, st = 0;
@@ -590,7 +590,7 @@ static int test_gf2m_sqr()
     return st;
 }
 
-static int test_gf2m_modinv()
+static int test_gf2m_modinv(void)
 {
     BIGNUM *a = NULL, *b[2] = {NULL,NULL}, *c = NULL, *d = NULL;
     int i, j, st = 0;
@@ -625,7 +625,7 @@ static int test_gf2m_modinv()
     return st;
 }
 
-static int test_gf2m_moddiv()
+static int test_gf2m_moddiv(void)
 {
     BIGNUM *a = NULL, *b[2] = {NULL,NULL}, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL;
@@ -667,7 +667,7 @@ static int test_gf2m_moddiv()
     return st;
 }
 
-static int test_gf2m_modexp()
+static int test_gf2m_modexp(void)
 {
     BIGNUM *a = NULL, *b[2] = {NULL,NULL}, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL;
@@ -713,7 +713,7 @@ static int test_gf2m_modexp()
     return st;
 }
 
-static int test_gf2m_modsqrt()
+static int test_gf2m_modsqrt(void)
 {
     BIGNUM *a = NULL, *b[2] = {NULL,NULL}, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL;
@@ -755,7 +755,7 @@ static int test_gf2m_modsqrt()
     return st;
 }
 
-static int test_gf2m_modsolvequad()
+static int test_gf2m_modsolvequad(void)
 {
     BIGNUM *a = NULL, *b[2] = {NULL,NULL}, *c = NULL, *d = NULL;
     BIGNUM *e = NULL;
@@ -806,7 +806,7 @@ static int test_gf2m_modsolvequad()
 }
 #endif
 
-static int test_kronecker()
+static int test_kronecker(void)
 {
     BIGNUM *a = NULL, *b = NULL, *r = NULL, *t = NULL;
     int i, legendre, kronecker, st = 0;
@@ -1442,7 +1442,7 @@ err:
     return st;
 }
 
-static int test_bn2padded()
+static int test_bn2padded(void)
 {
 #if HAVE_BN_PADDED
     uint8_t zeros[256], out[256], reference[128];
@@ -1503,7 +1503,7 @@ err:
 #endif
 }
 
-static int test_dec2bn()
+static int test_dec2bn(void)
 {
     BIGNUM *bn = NULL;
     int st = 0;
@@ -1572,7 +1572,7 @@ err:
     return st;
 }
 
-static int test_hex2bn()
+static int test_hex2bn(void)
 {
     BIGNUM *bn = NULL;
     int st = 0;
@@ -1638,7 +1638,7 @@ err:
     return st;
 }
 
-static int test_asc2bn()
+static int test_asc2bn(void)
 {
     BIGNUM *bn = NULL;
     int st = 0;
@@ -1736,7 +1736,7 @@ err:
     return st;
 }
 
-static int test_rand()
+static int test_rand(void)
 {
     BIGNUM *bn = NULL;
     int st = 0;
@@ -1762,7 +1762,7 @@ err:
     return st;
 }
 
-static int test_negzero()
+static int test_negzero(void)
 {
     BIGNUM *a = NULL, *b = NULL, *c = NULL, *d = NULL;
     BIGNUM *numerator = NULL, *denominator = NULL;
@@ -1831,7 +1831,7 @@ err:
     return st;
 }
 
-static int test_badmod()
+static int test_badmod(void)
 {
     BIGNUM *a = NULL, *b = NULL, *zero = NULL;
     BN_MONT_CTX *mont = NULL;
@@ -1897,7 +1897,7 @@ err:
     return st;
 }
 
-static int test_expmodzero()
+static int test_expmodzero(void)
 {
     BIGNUM *a = NULL, *r = NULL, *zero = NULL;
     int st = 0;
@@ -1930,7 +1930,7 @@ err:
     return st;
 }
 
-static int test_smallprime()
+static int test_smallprime(void)
 {
     static const int kBits = 10;
     BIGNUM *r;
@@ -1948,7 +1948,7 @@ err:
     return st;
 }
 
-static int test_3_is_prime()
+static int test_3_is_prime(void)
 {
     int ret = 0;
     BIGNUM *r = NULL;
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
index 0297b0d2fa..829042748a 100644
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_test.c
@@ -186,7 +186,7 @@ static int execute_test(CIPHERLIST_TEST_FIXTURE *fixture)
 #define EXECUTE_CIPHERLIST_TEST() \
     EXECUTE_TEST(execute_test, tear_down)
 
-static int test_default_cipherlist_implicit()
+static int test_default_cipherlist_implicit(void)
 {
     SETUP_CIPHERLIST_TEST_FIXTURE();
     if (fixture == NULL)
@@ -195,7 +195,7 @@ static int test_default_cipherlist_implicit()
     return result;
 }
 
-static int test_default_cipherlist_explicit()
+static int test_default_cipherlist_explicit(void)
 {
     SETUP_CIPHERLIST_TEST_FIXTURE();
     if (fixture == NULL)
diff --git a/test/ciphername_test.c b/test/ciphername_test.c
index 97cc56a92c..f010a3b8bc 100644
--- a/test/ciphername_test.c
+++ b/test/ciphername_test.c
@@ -376,7 +376,7 @@ static const char *get_std_name_by_id(int id)
     return NULL;
 }
 
-static int test_cipher_name()
+static int test_cipher_name(void)
 {
     SSL_CTX *ctx = NULL;
     SSL *ssl = NULL;
diff --git a/test/d2i_test.c b/test/d2i_test.c
index 0901b5d9fb..e5ebcfa027 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -41,7 +41,7 @@ typedef struct {
 
 static expected_error_t expected_error = ASN1_UNKNOWN;
 
-static int test_bad_asn1()
+static int test_bad_asn1(void)
 {
     BIO *bio = NULL;
     ASN1_VALUE *value = NULL;
diff --git a/test/danetest.c b/test/danetest.c
index b589ede426..d21f554c7e 100644
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -384,7 +384,7 @@ static int test_tlsafile(SSL_CTX *ctx, const char *base_name,
     return ret;
 }
 
-static int run_tlsatest()
+static int run_tlsatest(void)
 {
     SSL_CTX *ctx = NULL;
     BIO *f = NULL;
diff --git a/test/drbgtest.c b/test/drbgtest.c
index f28cd48dd1..62d2dbde64 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -477,7 +477,7 @@ err:
 
 #define RAND_ADD_SIZE 500
 
-static int test_rand_add()
+static int test_rand_add(void)
 {
     char *p;
 
diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index 8bd9e6c4db..e53afdf33b 100644
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -165,7 +165,7 @@ static int x9_62_test_internal(int nid, const char *r_in, const char *s_in)
     return ret;
 }
 
-static int x9_62_tests()
+static int x9_62_tests(void)
 {
     int ret = 0;
 
diff --git a/test/ecstresstest.c b/test/ecstresstest.c
index 1cdb12b228..e16ccd59f6 100644
--- a/test/ecstresstest.c
+++ b/test/ecstresstest.c
@@ -64,7 +64,7 @@ err:
     return NULL;
 }
 
-static int test_curve()
+static int test_curve(void)
 {
     EC_GROUP *group = NULL;
     EC_POINT *point = NULL;
diff --git a/test/exptest.c b/test/exptest.c
index 11347123e6..b357a2349d 100644
--- a/test/exptest.c
+++ b/test/exptest.c
@@ -43,7 +43,7 @@ static int a_is_zero_mod_one(const char *method, const BIGNUM *r,
 /*
  * test_mod_exp_zero tests that x**0 mod 1 == 0. It returns zero on success.
  */
-static int test_mod_exp_zero()
+static int test_mod_exp_zero(void)
 {
     BIGNUM *a = NULL, *p = NULL, *m = NULL;
     BIGNUM *r = NULL;
diff --git a/test/hmactest.c b/test/hmactest.c
index 2431be5cb6..efe21e0609 100644
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -105,7 +105,7 @@ static int test_hmac_md5(int idx)
 }
 # endif
 
-static int test_hmac_bad()
+static int test_hmac_bad(void)
 {
     HMAC_CTX *ctx = NULL;
     int ret = 0;
@@ -125,7 +125,7 @@ err:
     return ret;
 }
 
-static int test_hmac_run()
+static int test_hmac_run(void)
 {
     char *p;
     HMAC_CTX *ctx = NULL;
@@ -180,7 +180,7 @@ err:
 }
 
 
-static int test_hmac_single_shot()
+static int test_hmac_single_shot(void)
 {
     char *p;
 
@@ -194,7 +194,7 @@ static int test_hmac_single_shot()
 }
 
 
-static int test_hmac_copy()
+static int test_hmac_copy(void)
 {
     char *p;
     HMAC_CTX *ctx = NULL, *ctx2 = NULL;
diff --git a/test/packettest.c b/test/packettest.c
index 3f38e207b0..83d1ccd3bb 100644
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -14,7 +14,7 @@
 
 static unsigned char smbuf[BUF_LEN];
 
-static int test_PACKET_remaining()
+static int test_PACKET_remaining(void)
 {
     PACKET pkt;
 
@@ -29,7 +29,7 @@ static int test_PACKET_remaining()
     return 1;
 }
 
-static int test_PACKET_end()
+static int test_PACKET_end(void)
 {
     PACKET pkt;
 
@@ -45,7 +45,7 @@ static int test_PACKET_end()
     return 1;
 }
 
-static int test_PACKET_get_1()
+static int test_PACKET_get_1(void)
 {
     unsigned int i;
     PACKET pkt;
@@ -62,7 +62,7 @@ static int test_PACKET_get_1()
     return 1;
 }
 
-static int test_PACKET_get_4()
+static int test_PACKET_get_4(void)
 {
     unsigned long i;
     PACKET pkt;
@@ -79,7 +79,7 @@ static int test_PACKET_get_4()
     return 1;
 }
 
-static int test_PACKET_get_net_2()
+static int test_PACKET_get_net_2(void)
 {
     unsigned int i;
     PACKET pkt;
@@ -96,7 +96,7 @@ static int test_PACKET_get_net_2()
     return 1;
 }
 
-static int test_PACKET_get_net_3()
+static int test_PACKET_get_net_3(void)
 {
     unsigned long i;
     PACKET pkt;
@@ -113,7 +113,7 @@ static int test_PACKET_get_net_3()
     return 1;
 }
 
-static int test_PACKET_get_net_4()
+static int test_PACKET_get_net_4(void)
 {
     unsigned long i;
     PACKET pkt;
@@ -130,7 +130,7 @@ static int test_PACKET_get_net_4()
     return 1;
 }
 
-static int test_PACKET_get_sub_packet()
+static int test_PACKET_get_sub_packet(void)
 {
     PACKET pkt, subpkt;
     unsigned long i;
@@ -151,7 +151,7 @@ static int test_PACKET_get_sub_packet()
     return 1;
 }
 
-static int test_PACKET_get_bytes()
+static int test_PACKET_get_bytes(void)
 {
     const unsigned char *bytes;
     PACKET pkt;
@@ -175,7 +175,7 @@ static int test_PACKET_get_bytes()
     return 1;
 }
 
-static int test_PACKET_copy_bytes()
+static int test_PACKET_copy_bytes(void)
 {
     unsigned char bytes[4];
     PACKET pkt;
@@ -199,7 +199,7 @@ static int test_PACKET_copy_bytes()
     return 1;
 }
 
-static int test_PACKET_copy_all()
+static int test_PACKET_copy_all(void)
 {
     unsigned char tmp[BUF_LEN];
     PACKET pkt;
@@ -216,7 +216,7 @@ static int test_PACKET_copy_all()
     return 1;
 }
 
-static int test_PACKET_memdup()
+static int test_PACKET_memdup(void)
 {
     unsigned char *data = NULL;
     size_t len;
@@ -238,7 +238,7 @@ end:
     return result;
 }
 
-static int test_PACKET_strndup()
+static int test_PACKET_strndup(void)
 {
     char buf1[10], buf2[10];
     char *data = NULL;
@@ -265,7 +265,7 @@ end:
     return result;
 }
 
-static int test_PACKET_contains_zero_byte()
+static int test_PACKET_contains_zero_byte(void)
 {
     char buf1[10], buf2[10];
     PACKET pkt;
@@ -283,7 +283,7 @@ static int test_PACKET_contains_zero_byte()
     return 1;
 }
 
-static int test_PACKET_forward()
+static int test_PACKET_forward(void)
 {
     const unsigned char *byte;
     PACKET pkt;
@@ -300,7 +300,7 @@ static int test_PACKET_forward()
     return 1;
 }
 
-static int test_PACKET_buf_init()
+static int test_PACKET_buf_init(void)
 {
     unsigned char buf1[BUF_LEN];
     PACKET pkt;
@@ -316,7 +316,7 @@ static int test_PACKET_buf_init()
     return 1;
 }
 
-static int test_PACKET_null_init()
+static int test_PACKET_null_init(void)
 {
     PACKET pkt;
 
@@ -328,7 +328,7 @@ static int test_PACKET_null_init()
     return 1;
 }
 
-static int test_PACKET_equal()
+static int test_PACKET_equal(void)
 {
     PACKET pkt;
 
@@ -345,7 +345,7 @@ static int test_PACKET_equal()
     return 1;
 }
 
-static int test_PACKET_get_length_prefixed_1()
+static int test_PACKET_get_length_prefixed_1(void)
 {
     unsigned char buf1[BUF_LEN];
     const size_t len = 16;
@@ -369,7 +369,7 @@ static int test_PACKET_get_length_prefixed_1()
     return 1;
 }
 
-static int test_PACKET_get_length_prefixed_2()
+static int test_PACKET_get_length_prefixed_2(void)
 {
     unsigned char buf1[1024];
     const size_t len = 516;  /* 0x0204 */
@@ -392,7 +392,7 @@ static int test_PACKET_get_length_prefixed_2()
     return 1;
 }
 
-static int test_PACKET_get_length_prefixed_3()
+static int test_PACKET_get_length_prefixed_3(void)
 {
     unsigned char buf1[1024];
     const size_t len = 516;  /* 0x000204 */
@@ -415,7 +415,7 @@ static int test_PACKET_get_length_prefixed_3()
     return 1;
 }
 
-static int test_PACKET_as_length_prefixed_1()
+static int test_PACKET_as_length_prefixed_1(void)
 {
     unsigned char buf1[BUF_LEN];
     const size_t len = 16;
@@ -438,7 +438,7 @@ static int test_PACKET_as_length_prefixed_1()
     return 1;
 }
 
-static int test_PACKET_as_length_prefixed_2()
+static int test_PACKET_as_length_prefixed_2(void)
 {
     unsigned char buf[1024];
     const size_t len = 516;  /* 0x0204 */
diff --git a/test/pkey_meth_test.c b/test/pkey_meth_test.c
index ea77790a03..004bb30bb7 100644
--- a/test/pkey_meth_test.c
+++ b/test/pkey_meth_test.c
@@ -48,7 +48,7 @@ static int test_asn1_meths(void)
 }
 
 /* Test of EVP_PKEY_METHOD ordering */
-static int test_pkey_meths()
+static int test_pkey_meths(void)
 {
     size_t i;
     int prev = -1;
diff --git a/test/servername_test.c b/test/servername_test.c
index afb745709e..e0fe4d5eb5 100644
--- a/test/servername_test.c
+++ b/test/servername_test.c
@@ -77,7 +77,7 @@ end:
     return ret;
 }
 
-static int client_setup_sni_before_state()
+static int client_setup_sni_before_state(void)
 {
     SSL_CTX *ctx;
     SSL *con = NULL;
@@ -125,7 +125,7 @@ end:
     return ret;
 }
 
-static int client_setup_sni_after_state()
+static int client_setup_sni_after_state(void)
 {
     SSL_CTX *ctx;
     SSL *con = NULL;
@@ -174,7 +174,7 @@ end:
     return ret;
 }
 
-static int server_setup_sni()
+static int server_setup_sni(void)
 {
     SSL_CTX *ctx;
     SSL *con = NULL;
diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index e9529c6345..9d6d2b5759 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -51,7 +51,7 @@ static int do_test_cert_table(int nid, uint32_t amask, size_t idx,
 
 /* Sanity check of ssl_cert_table */
 
-static int test_ssl_cert_table()
+static int test_ssl_cert_table(void)
 {
     TEST_size_t_eq(OSSL_NELEM(ssl_cert_info), SSL_PKEY_NUM);
     if (!test_cert_table(EVP_PKEY_RSA, SSL_aRSA, SSL_PKEY_RSA))
diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index 6ce9452e0e..f7ffe40197 100644
--- a/test/ssl_test_ctx_test.c
+++ b/test/ssl_test_ctx_test.c
@@ -137,7 +137,7 @@ static void tear_down(SSL_TEST_CTX_TEST_FIXTURE *fixture)
 #define EXECUTE_SSL_TEST_CTX_TEST() \
     EXECUTE_TEST(execute_test, tear_down)
 
-static int test_empty_configuration()
+static int test_empty_configuration(void)
 {
     SETUP_SSL_TEST_CTX_TEST_FIXTURE();
     if (fixture == NULL)
@@ -148,7 +148,7 @@ static int test_empty_configuration()
     return result;
 }
 
-static int test_good_configuration()
+static int test_good_configuration(void)
 {
     SETUP_SSL_TEST_CTX_TEST_FIXTURE();
     if (fixture == NULL)
diff --git a/test/uitest.c b/test/uitest.c
index d2828f83b7..03db008c71 100644
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -30,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;
@@ -71,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",
diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index 001aba54ce..7790b821e7 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -273,7 +273,7 @@ static int test_x509_cmp_time(int idx)
     return 1;
 }
 
-static int test_x509_cmp_time_current()
+static int test_x509_cmp_time_current(void)
 {
     time_t now = time(NULL);
     /* Pick a day earlier and later, relative to any system clock. */
-- 
2.34.1