[openssl-commits] [openssl] master update
Kurt Roeckx
kurt at openssl.org
Fri May 11 12:38:14 UTC 2018
The branch master has been updated
via 3cb7c5cfef25463bd197b0c12ca7966f525ebf73 (commit)
via d4a8ba77a4004b40890c4a9700ba959fd26af170 (commit)
from c3114a7732f423ec42a86392e12c8c3783c53aae (commit)
- Log -----------------------------------------------------------------
commit 3cb7c5cfef25463bd197b0c12ca7966f525ebf73
Author: Kurt Roeckx <kurt at roeckx.be>
Date: Wed May 9 17:09:50 2018 +0200
Use void in all function definitions that do not take any arguments
Reviewed-by: Rich Salz <rsalz at openssl.org>
GH: #6208
commit d4a8ba77a4004b40890c4a9700ba959fd26af170
Author: Kurt Roeckx <kurt at roeckx.be>
Date: Wed May 9 18:32:02 2018 +0200
rsaz_avx2_eligible doesn't take parameters
Reviewed-by: Rich Salz <rsalz at openssl.org>
GH: #6208
-----------------------------------------------------------------------
Summary of changes:
apps/apps.c | 2 +-
apps/openssl.c | 6 +++---
crypto/bio/bio_meth.c | 2 +-
crypto/bn/rsaz_exp.h | 2 +-
crypto/conf/conf_def.c | 4 ++--
crypto/ct/ct_log.c | 2 +-
crypto/engine/tb_cipher.c | 2 +-
crypto/engine/tb_dh.c | 2 +-
crypto/engine/tb_digest.c | 2 +-
crypto/engine/tb_dsa.c | 2 +-
crypto/engine/tb_eckey.c | 2 +-
crypto/engine/tb_pkmeth.c | 2 +-
crypto/engine/tb_rand.c | 2 +-
crypto/engine/tb_rsa.c | 2 +-
crypto/mem_sec.c | 8 ++++----
crypto/poly1305/poly1305.c | 2 +-
crypto/rand/drbg_lib.c | 2 +-
crypto/rand/rand_lib.c | 2 +-
crypto/store/store_init.c | 2 +-
crypto/ts/ts_rsp_sign.c | 2 +-
crypto/x509/x509_lu.c | 2 +-
ssl/pqueue.c | 2 +-
test/asynciotest.c | 2 +-
test/asynctest.c | 10 +++++-----
test/cipherlist_test.c | 2 +-
test/drbgtest.c | 2 +-
test/dtls_mtu_test.c | 2 +-
test/dtlsv1listentest.c | 2 +-
test/evp_test.c | 2 +-
test/exdatatest.c | 2 +-
test/generate_buildtest.pl | 2 +-
test/handshake_helper.c | 2 +-
test/mdc2_internal_test.c | 2 +-
test/modes_internal_test.c | 4 ++--
test/pkey_meth_kdf_test.c | 2 +-
test/pkey_meth_test.c | 2 +-
test/rdrand_sanitytest.c | 11 ++++++-----
test/ssl_cert_table_internal_test.c | 2 +-
test/ssl_test_ctx.c | 2 +-
test/sslcorrupttest.c | 2 +-
test/ssltest_old.c | 8 ++++----
test/time_offset_test.c | 2 +-
test/tls13ccstest.c | 2 +-
test/tls13secretstest.c | 2 +-
test/v3nametest.c | 2 +-
test/x509_internal_test.c | 2 +-
test/x509_time_test.c | 2 +-
47 files changed, 66 insertions(+), 65 deletions(-)
diff --git a/apps/apps.c b/apps/apps.c
index b35ea56..d5a6aea 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2486,7 +2486,7 @@ BIO *dup_bio_err(int format)
return b;
}
-void destroy_prefix_method()
+void destroy_prefix_method(void)
{
BIO_meth_free(prefix_method);
prefix_method = NULL;
diff --git a/apps/openssl.c b/apps/openssl.c
index 8224ae3..a872e2c 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -74,7 +74,7 @@ static void calculate_columns(DISPLAY_COLUMNS *dc)
dc->columns = (80 - 1) / dc->width;
}
-static int apps_startup()
+static int apps_startup(void)
{
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
@@ -90,13 +90,13 @@ static int apps_startup()
return 1;
}
-static void apps_shutdown()
+static void apps_shutdown(void)
{
destroy_ui_method();
destroy_prefix_method();
}
-static char *make_config_name()
+static char *make_config_name(void)
{
const char *t;
size_t len;
diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index 21df94a..493ff63 100644
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c
@@ -19,7 +19,7 @@ DEFINE_RUN_ONCE_STATIC(do_bio_type_init)
return bio_type_lock != NULL;
}
-int BIO_get_new_index()
+int BIO_get_new_index(void)
{
static CRYPTO_REF_COUNT bio_count = BIO_TYPE_START;
int newval;
diff --git a/crypto/bn/rsaz_exp.h b/crypto/bn/rsaz_exp.h
index 1c5e618..488b136 100644
--- a/crypto/bn/rsaz_exp.h
+++ b/crypto/bn/rsaz_exp.h
@@ -28,7 +28,7 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result[16],
const BN_ULONG exponent[16],
const BN_ULONG m_norm[16], const BN_ULONG RR[16],
BN_ULONG k0);
-int rsaz_avx2_eligible();
+int rsaz_avx2_eligible(void);
void RSAZ_512_mod_exp(BN_ULONG result[8],
const BN_ULONG base_norm[8], const BN_ULONG exponent[8],
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index aa9f2fa..7340a91 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -85,12 +85,12 @@ static CONF_METHOD WIN32_method = {
def_load
};
-CONF_METHOD *NCONF_default()
+CONF_METHOD *NCONF_default(void)
{
return &default_method;
}
-CONF_METHOD *NCONF_WIN32()
+CONF_METHOD *NCONF_WIN32(void)
{
return &WIN32_method;
}
diff --git a/crypto/ct/ct_log.c b/crypto/ct/ct_log.c
index d442322..4e5c109 100644
--- a/crypto/ct/ct_log.c
+++ b/crypto/ct/ct_log.c
@@ -54,7 +54,7 @@ static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new();
*/
static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX* ctx);
-static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new()
+static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new(void)
{
CTLOG_STORE_LOAD_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx));
diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index ac49141..45d754f 100644
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.c
@@ -34,7 +34,7 @@ int ENGINE_register_ciphers(ENGINE *e)
return 1;
}
-void ENGINE_register_all_ciphers()
+void ENGINE_register_all_ciphers(void)
{
ENGINE *e;
diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
index c6440df..427a3f0 100644
--- a/crypto/engine/tb_dh.c
+++ b/crypto/engine/tb_dh.c
@@ -31,7 +31,7 @@ int ENGINE_register_DH(ENGINE *e)
return 1;
}
-void ENGINE_register_all_DH()
+void ENGINE_register_all_DH(void)
{
ENGINE *e;
diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
index 194b9c7..019adcf 100644
--- a/crypto/engine/tb_digest.c
+++ b/crypto/engine/tb_digest.c
@@ -34,7 +34,7 @@ int ENGINE_register_digests(ENGINE *e)
return 1;
}
-void ENGINE_register_all_digests()
+void ENGINE_register_all_digests(void)
{
ENGINE *e;
diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
index fdb80cd..90d5476 100644
--- a/crypto/engine/tb_dsa.c
+++ b/crypto/engine/tb_dsa.c
@@ -31,7 +31,7 @@ int ENGINE_register_DSA(ENGINE *e)
return 1;
}
-void ENGINE_register_all_DSA()
+void ENGINE_register_all_DSA(void)
{
ENGINE *e;
diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c
index 75750b2..713fdc5 100644
--- a/crypto/engine/tb_eckey.c
+++ b/crypto/engine/tb_eckey.c
@@ -31,7 +31,7 @@ int ENGINE_register_EC(ENGINE *e)
return 1;
}
-void ENGINE_register_all_EC()
+void ENGINE_register_all_EC(void)
{
ENGINE *e;
diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c
index 2e82d85..e6c7ad2 100644
--- a/crypto/engine/tb_pkmeth.c
+++ b/crypto/engine/tb_pkmeth.c
@@ -35,7 +35,7 @@ int ENGINE_register_pkey_meths(ENGINE *e)
return 1;
}
-void ENGINE_register_all_pkey_meths()
+void ENGINE_register_all_pkey_meths(void)
{
ENGINE *e;
diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
index 225e7c8..759d2f7 100644
--- a/crypto/engine/tb_rand.c
+++ b/crypto/engine/tb_rand.c
@@ -31,7 +31,7 @@ int ENGINE_register_RAND(ENGINE *e)
return 1;
}
-void ENGINE_register_all_RAND()
+void ENGINE_register_all_RAND(void)
{
ENGINE *e;
diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
index e2cc680..5c523d6 100644
--- a/crypto/engine/tb_rsa.c
+++ b/crypto/engine/tb_rsa.c
@@ -31,7 +31,7 @@ int ENGINE_register_RSA(ENGINE *e)
return 1;
}
-void ENGINE_register_all_RSA()
+void ENGINE_register_all_RSA(void)
{
ENGINE *e;
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 1c13270..959c637 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -92,7 +92,7 @@ int CRYPTO_secure_malloc_init(size_t size, int minsize)
#endif /* IMPLEMENTED */
}
-int CRYPTO_secure_malloc_done()
+int CRYPTO_secure_malloc_done(void)
{
#ifdef IMPLEMENTED
if (secure_mem_used == 0) {
@@ -106,7 +106,7 @@ int CRYPTO_secure_malloc_done()
return 0;
}
-int CRYPTO_secure_malloc_initialized()
+int CRYPTO_secure_malloc_initialized(void)
{
#ifdef IMPLEMENTED
return secure_mem_initialized;
@@ -209,7 +209,7 @@ int CRYPTO_secure_allocated(const void *ptr)
#endif /* IMPLEMENTED */
}
-size_t CRYPTO_secure_used()
+size_t CRYPTO_secure_used(void)
{
#ifdef IMPLEMENTED
return secure_mem_used;
@@ -500,7 +500,7 @@ static int sh_init(size_t size, int minsize)
return 0;
}
-static void sh_done()
+static void sh_done(void)
{
OPENSSL_free(sh.freelist);
OPENSSL_free(sh.bittable);
diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c
index e3eb5da..1d18236 100644
--- a/crypto/poly1305/poly1305.c
+++ b/crypto/poly1305/poly1305.c
@@ -14,7 +14,7 @@
#include "internal/poly1305.h"
#include "poly1305_local.h"
-size_t Poly1305_ctx_size ()
+size_t Poly1305_ctx_size(void)
{
return sizeof(struct poly1305_context);
}
diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index 60ddd2f..729b49c 100644
--- a/crypto/rand/drbg_lib.c
+++ b/crypto/rand/drbg_lib.c
@@ -921,7 +921,7 @@ void rand_drbg_cleanup_int(void)
}
}
-void drbg_delete_thread_state()
+void drbg_delete_thread_state(void)
{
RAND_DRBG *drbg;
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 050c9d2..1a9a7d2 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -303,7 +303,7 @@ void rand_drbg_cleanup_additional_data(unsigned char *out, size_t outlen)
OPENSSL_secure_clear_free(out, outlen);
}
-void rand_fork()
+void rand_fork(void)
{
rand_fork_count++;
}
diff --git a/crypto/store/store_init.c b/crypto/store/store_init.c
index 4b53108..4d0ff01 100644
--- a/crypto/store/store_init.c
+++ b/crypto/store/store_init.c
@@ -18,7 +18,7 @@ DEFINE_RUN_ONCE_STATIC(do_store_init)
&& ossl_store_file_loader_init();
}
-int ossl_store_init_once()
+int ossl_store_init_once(void)
{
if (!RUN_ONCE(&store_init, do_store_init)) {
OSSL_STOREerr(OSSL_STORE_F_OSSL_STORE_INIT_ONCE, ERR_R_MALLOC_FAILURE);
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index ed45c00..1b2b84e 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -117,7 +117,7 @@ static int def_extension_cb(struct TS_resp_ctx *ctx, X509_EXTENSION *ext,
/* TS_RESP_CTX management functions. */
-TS_RESP_CTX *TS_RESP_CTX_new()
+TS_RESP_CTX *TS_RESP_CTX_new(void)
{
TS_RESP_CTX *ctx;
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index fbeed01..639a3df 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -391,7 +391,7 @@ X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a)
return a->type;
}
-X509_OBJECT *X509_OBJECT_new()
+X509_OBJECT *X509_OBJECT_new(void)
{
X509_OBJECT *ret = OPENSSL_zalloc(sizeof(*ret));
diff --git a/ssl/pqueue.c b/ssl/pqueue.c
index 29804ec..548a7a4 100644
--- a/ssl/pqueue.c
+++ b/ssl/pqueue.c
@@ -35,7 +35,7 @@ void pitem_free(pitem *item)
OPENSSL_free(item);
}
-pqueue *pqueue_new()
+pqueue *pqueue_new(void)
{
pqueue *pq = OPENSSL_zalloc(sizeof(*pq));
diff --git a/test/asynciotest.c b/test/asynciotest.c
index 54961b2..73e415f 100644
--- a/test/asynciotest.c
+++ b/test/asynciotest.c
@@ -42,7 +42,7 @@ struct async_ctrs {
unsigned int wctr;
};
-static const BIO_METHOD *bio_f_async_filter()
+static const BIO_METHOD *bio_f_async_filter(void)
{
if (methods_async == NULL) {
methods_async = BIO_meth_new(BIO_TYPE_ASYNC_FILTER, "Async filter");
diff --git a/test/asynctest.c b/test/asynctest.c
index eef3c32..c2740e6 100644
--- a/test/asynctest.c
+++ b/test/asynctest.c
@@ -87,7 +87,7 @@ static int blockpause(void *args)
return 1;
}
-static int test_ASYNC_init_thread()
+static int test_ASYNC_init_thread(void)
{
ASYNC_JOB *job1 = NULL, *job2 = NULL, *job3 = NULL;
int funcret1, funcret2, funcret3;
@@ -123,7 +123,7 @@ static int test_ASYNC_init_thread()
return 1;
}
-static int test_ASYNC_start_job()
+static int test_ASYNC_start_job(void)
{
ASYNC_JOB *job = NULL;
int funcret;
@@ -151,7 +151,7 @@ static int test_ASYNC_start_job()
return 1;
}
-static int test_ASYNC_get_current_job()
+static int test_ASYNC_get_current_job(void)
{
ASYNC_JOB *job = NULL;
int funcret;
@@ -178,7 +178,7 @@ static int test_ASYNC_get_current_job()
return 1;
}
-static int test_ASYNC_WAIT_CTX_get_all_fds()
+static int test_ASYNC_WAIT_CTX_get_all_fds(void)
{
ASYNC_JOB *job = NULL;
int funcret;
@@ -245,7 +245,7 @@ static int test_ASYNC_WAIT_CTX_get_all_fds()
return 1;
}
-static int test_ASYNC_block_pause()
+static int test_ASYNC_block_pause(void)
{
ASYNC_JOB *job = NULL;
int funcret;
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
index b224983..5023c1c 100644
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_test.c
@@ -215,7 +215,7 @@ static int test_default_cipherlist_explicit(void)
return result;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(test_default_cipherlist_implicit);
ADD_TEST(test_default_cipherlist_explicit);
diff --git a/test/drbgtest.c b/test/drbgtest.c
index d69456b..c1887d6 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -554,7 +554,7 @@ static void reset_hook_ctx(HOOK_CTX *ctx)
}
/* Resets all drbg hook contexts */
-static void reset_drbg_hook_ctx()
+static void reset_drbg_hook_ctx(void)
{
reset_hook_ctx(&master_ctx);
reset_hook_ctx(&public_ctx);
diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c
index dff65a7..8e385b0 100644
--- a/test/dtls_mtu_test.c
+++ b/test/dtls_mtu_test.c
@@ -189,7 +189,7 @@ static int run_mtu_tests(void)
return ret;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(run_mtu_tests);
return 1;
diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c
index 807bb6d..5331c3b 100644
--- a/test/dtlsv1listentest.c
+++ b/test/dtlsv1listentest.c
@@ -348,7 +348,7 @@ static int dtls_listen_test(int i)
}
#endif
-int setup_tests()
+int setup_tests(void)
{
#ifndef OPENSSL_NO_SOCK
ADD_ALL_TESTS(dtls_listen_test, (int)OSSL_NELEM(testpackets));
diff --git a/test/evp_test.c b/test/evp_test.c
index b36f25e..e2274d9 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -2378,7 +2378,7 @@ static void free_key_list(KEY_LIST *lst)
/*
* Is the key type an unsupported algorithm?
*/
-static int key_unsupported()
+static int key_unsupported(void)
{
long err = ERR_peek_error();
diff --git a/test/exdatatest.c b/test/exdatatest.c
index 0ded7db..6e90752 100644
--- a/test/exdatatest.c
+++ b/test/exdatatest.c
@@ -127,7 +127,7 @@ typedef struct myobj_st {
int st;
} MYOBJ;
-static MYOBJ *MYOBJ_new()
+static MYOBJ *MYOBJ_new(void)
{
static int count = 0;
MYOBJ *obj = OPENSSL_malloc(sizeof(*obj));
diff --git a/test/generate_buildtest.pl b/test/generate_buildtest.pl
index 0a9d879..7d55362 100644
--- a/test/generate_buildtest.pl
+++ b/test/generate_buildtest.pl
@@ -27,7 +27,7 @@ print <<"_____";
# include <openssl/$name.h>
#endif
-int main()
+int main(void)
{
return 0;
}
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index 9b781b0..fc5fcd6 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -22,7 +22,7 @@
#include "handshake_helper.h"
#include "testutil.h"
-HANDSHAKE_RESULT *HANDSHAKE_RESULT_new()
+HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void)
{
HANDSHAKE_RESULT *ret;
diff --git a/test/mdc2_internal_test.c b/test/mdc2_internal_test.c
index 64aa2dc..a5c4ebc 100644
--- a/test/mdc2_internal_test.c
+++ b/test/mdc2_internal_test.c
@@ -64,7 +64,7 @@ static int test_mdc2(int idx)
return 1;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_ALL_TESTS(test_mdc2, OSSL_NELEM(tests));
return 1;
diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c
index 18c0977..e0f1adf 100644
--- a/test/modes_internal_test.c
+++ b/test/modes_internal_test.c
@@ -99,7 +99,7 @@ static const SIZED_DATA aes_cts128_vectors[] = {
CTS128_TEST_VECTOR(64),
};
-static AES_KEY *cts128_encrypt_key_schedule()
+static AES_KEY *cts128_encrypt_key_schedule(void)
{
static int init_key = 1;
static AES_KEY ks;
@@ -111,7 +111,7 @@ static AES_KEY *cts128_encrypt_key_schedule()
return &ks;
}
-static AES_KEY *cts128_decrypt_key_schedule()
+static AES_KEY *cts128_decrypt_key_schedule(void)
{
static int init_key = 1;
static AES_KEY ks;
diff --git a/test/pkey_meth_kdf_test.c b/test/pkey_meth_kdf_test.c
index 5d4c468..98495b6 100644
--- a/test/pkey_meth_kdf_test.c
+++ b/test/pkey_meth_kdf_test.c
@@ -170,7 +170,7 @@ static int test_kdf_scrypt(void)
}
#endif
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(test_kdf_tls1_prf);
ADD_TEST(test_kdf_hkdf);
diff --git a/test/pkey_meth_test.c b/test/pkey_meth_test.c
index 004bb30..0277013 100644
--- a/test/pkey_meth_test.c
+++ b/test/pkey_meth_test.c
@@ -75,7 +75,7 @@ static int test_pkey_meths(void)
return good;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(test_asn1_meths);
ADD_TEST(test_pkey_meths);
diff --git a/test/rdrand_sanitytest.c b/test/rdrand_sanitytest.c
index 1844d72..0e67b37 100644
--- a/test/rdrand_sanitytest.c
+++ b/test/rdrand_sanitytest.c
@@ -20,7 +20,7 @@
size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len);
size_t OPENSSL_ia32_rdseed_bytes(unsigned char *buf, size_t len);
-void OPENSSL_cpuid_setup();
+void OPENSSL_cpuid_setup(void);
extern unsigned int OPENSSL_ia32cap_P[4];
@@ -81,12 +81,12 @@ end:
return testresult;
}
-static int sanity_check_rdrand_bytes()
+static int sanity_check_rdrand_bytes(void)
{
return sanity_check_bytes(OPENSSL_ia32_rdrand_bytes, 1000, 0, 10, 10);
}
-static int sanity_check_rdseed_bytes()
+static int sanity_check_rdseed_bytes(void)
{
/*-
* RDSEED may take many retries to succeed; note that this is effectively
@@ -97,7 +97,8 @@ static int sanity_check_rdseed_bytes()
return sanity_check_bytes(OPENSSL_ia32_rdseed_bytes, 1000, 1, 10000, 10);
}
-int setup_tests() {
+int setup_tests(void)
+{
OPENSSL_cpuid_setup();
int have_rdseed = (OPENSSL_ia32cap_P[2] & (1 << 18)) != 0;
@@ -117,7 +118,7 @@ int setup_tests() {
#else
-int setup_tests()
+int setup_tests(void)
{
return 1;
}
diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index 32ec4c8..2104e8c 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -76,7 +76,7 @@ static int test_ssl_cert_table(void)
return 1;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(test_ssl_cert_table);
return 1;
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index 7676966..5b427e5 100644
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -709,7 +709,7 @@ static const ssl_test_server_option ssl_test_server_options[] = {
{ "SessionTicketAppData", &parse_server_session_ticket_app_data },
};
-SSL_TEST_CTX *SSL_TEST_CTX_new()
+SSL_TEST_CTX *SSL_TEST_CTX_new(void)
{
SSL_TEST_CTX *ret;
diff --git a/test/sslcorrupttest.c b/test/sslcorrupttest.c
index 30d3d3d..d06c8c7 100644
--- a/test/sslcorrupttest.c
+++ b/test/sslcorrupttest.c
@@ -137,7 +137,7 @@ static void bio_f_tls_corrupt_filter_free(void)
*/
static const char **cipher_list = NULL;
-static int setup_cipher_list()
+static int setup_cipher_list(void)
{
SSL_CTX *ctx = NULL;
SSL *ssl = NULL;
diff --git a/test/ssltest_old.c b/test/ssltest_old.c
index 34705c3..e974f6c 100644
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -423,7 +423,7 @@ static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
return 1;
}
-static int verify_serverinfo()
+static int verify_serverinfo(void)
{
if (serverinfo_sct != serverinfo_sct_seen)
return -1;
@@ -2836,7 +2836,7 @@ static int app_verify_callback(X509_STORE_CTX *ctx, void *arg)
* $ openssl dhparam -C -noout -dsaparam 1024
* (The third function has been renamed to avoid name conflicts.)
*/
-static DH *get_dh512()
+static DH *get_dh512(void)
{
static unsigned char dh512_p[] = {
0xCB, 0xC8, 0xE1, 0x86, 0xD0, 0x1F, 0x94, 0x17, 0xA6, 0x99, 0xF0,
@@ -2870,7 +2870,7 @@ static DH *get_dh512()
return dh;
}
-static DH *get_dh1024()
+static DH *get_dh1024(void)
{
static unsigned char dh1024_p[] = {
0xF8, 0x81, 0x89, 0x7D, 0x14, 0x24, 0xC5, 0xD1, 0xE6, 0xF7, 0xBF,
@@ -2914,7 +2914,7 @@ static DH *get_dh1024()
return dh;
}
-static DH *get_dh1024dsa()
+static DH *get_dh1024dsa(void)
{
static unsigned char dh1024_p[] = {
0xC8, 0x00, 0xF7, 0x08, 0x07, 0x89, 0x4D, 0x90, 0x53, 0xF3, 0xD5,
diff --git a/test/time_offset_test.c b/test/time_offset_test.c
index f3b20dd..8776559 100644
--- a/test/time_offset_test.c
+++ b/test/time_offset_test.c
@@ -106,7 +106,7 @@ static int test_offset(int idx)
return 1;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_ALL_TESTS(test_offset, OSSL_NELEM(tests));
return 1;
diff --git a/test/tls13ccstest.c b/test/tls13ccstest.c
index 25dc819..92e9d59 100644
--- a/test/tls13ccstest.c
+++ b/test/tls13ccstest.c
@@ -37,7 +37,7 @@ static int watchccs_puts(BIO *bp, const char *str);
static BIO_METHOD *method_watchccs = NULL;
-static const BIO_METHOD *bio_f_watchccs_filter()
+static const BIO_METHOD *bio_f_watchccs_filter(void)
{
if (method_watchccs == NULL) {
method_watchccs = BIO_meth_new(BIO_TYPE_WATCHCCS_FILTER,
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index 8b775b8..313ab56 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -399,7 +399,7 @@ static int test_handshake_secrets(void)
return ret;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(test_handshake_secrets);
return 1;
diff --git a/test/v3nametest.c b/test/v3nametest.c
index 08684ea..86f3829 100644
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -251,7 +251,7 @@ static const struct set_name_fn name_fns[] = {
{set_altname_email, "set rfc822Name", 0, 1},
};
-static X509 *make_cert()
+static X509 *make_cert(void)
{
X509 *crt = NULL;
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 03bbcf2..9f351a4 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -57,7 +57,7 @@ static int test_standard_exts(void)
return good;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(test_standard_exts);
return 1;
diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index 5983bdf..d672a9a 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -482,7 +482,7 @@ static int test_x509_time_print(int idx)
return ret;
}
-int setup_tests()
+int setup_tests(void)
{
ADD_TEST(test_x509_cmp_time_current);
ADD_ALL_TESTS(test_x509_cmp_time, OSSL_NELEM(x509_cmp_tests));
More information about the openssl-commits
mailing list