Use void in all function definitions that do not take any arguments

Reviewed-by: Rich Salz <rsalz@openssl.org>
GH: #6208
This commit is contained in:
Kurt Roeckx 2018-05-09 17:09:50 +02:00
parent d4a8ba77a4
commit 3cb7c5cfef
46 changed files with 65 additions and 64 deletions

View file

@ -2486,7 +2486,7 @@ BIO *dup_bio_err(int format)
return b; return b;
} }
void destroy_prefix_method() void destroy_prefix_method(void)
{ {
BIO_meth_free(prefix_method); BIO_meth_free(prefix_method);
prefix_method = NULL; prefix_method = NULL;

View file

@ -74,7 +74,7 @@ static void calculate_columns(DISPLAY_COLUMNS *dc)
dc->columns = (80 - 1) / dc->width; dc->columns = (80 - 1) / dc->width;
} }
static int apps_startup() static int apps_startup(void)
{ {
#ifdef SIGPIPE #ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -90,13 +90,13 @@ static int apps_startup()
return 1; return 1;
} }
static void apps_shutdown() static void apps_shutdown(void)
{ {
destroy_ui_method(); destroy_ui_method();
destroy_prefix_method(); destroy_prefix_method();
} }
static char *make_config_name() static char *make_config_name(void)
{ {
const char *t; const char *t;
size_t len; size_t len;

View file

@ -19,7 +19,7 @@ DEFINE_RUN_ONCE_STATIC(do_bio_type_init)
return bio_type_lock != NULL; 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; static CRYPTO_REF_COUNT bio_count = BIO_TYPE_START;
int newval; int newval;

View file

@ -85,12 +85,12 @@ static CONF_METHOD WIN32_method = {
def_load def_load
}; };
CONF_METHOD *NCONF_default() CONF_METHOD *NCONF_default(void)
{ {
return &default_method; return &default_method;
} }
CONF_METHOD *NCONF_WIN32() CONF_METHOD *NCONF_WIN32(void)
{ {
return &WIN32_method; return &WIN32_method;
} }

View file

@ -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 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)); CTLOG_STORE_LOAD_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx));

View file

@ -34,7 +34,7 @@ int ENGINE_register_ciphers(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_ciphers() void ENGINE_register_all_ciphers(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -31,7 +31,7 @@ int ENGINE_register_DH(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_DH() void ENGINE_register_all_DH(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -34,7 +34,7 @@ int ENGINE_register_digests(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_digests() void ENGINE_register_all_digests(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -31,7 +31,7 @@ int ENGINE_register_DSA(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_DSA() void ENGINE_register_all_DSA(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -31,7 +31,7 @@ int ENGINE_register_EC(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_EC() void ENGINE_register_all_EC(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -35,7 +35,7 @@ int ENGINE_register_pkey_meths(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_pkey_meths() void ENGINE_register_all_pkey_meths(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -31,7 +31,7 @@ int ENGINE_register_RAND(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_RAND() void ENGINE_register_all_RAND(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -31,7 +31,7 @@ int ENGINE_register_RSA(ENGINE *e)
return 1; return 1;
} }
void ENGINE_register_all_RSA() void ENGINE_register_all_RSA(void)
{ {
ENGINE *e; ENGINE *e;

View file

@ -92,7 +92,7 @@ int CRYPTO_secure_malloc_init(size_t size, int minsize)
#endif /* IMPLEMENTED */ #endif /* IMPLEMENTED */
} }
int CRYPTO_secure_malloc_done() int CRYPTO_secure_malloc_done(void)
{ {
#ifdef IMPLEMENTED #ifdef IMPLEMENTED
if (secure_mem_used == 0) { if (secure_mem_used == 0) {
@ -106,7 +106,7 @@ int CRYPTO_secure_malloc_done()
return 0; return 0;
} }
int CRYPTO_secure_malloc_initialized() int CRYPTO_secure_malloc_initialized(void)
{ {
#ifdef IMPLEMENTED #ifdef IMPLEMENTED
return secure_mem_initialized; return secure_mem_initialized;
@ -209,7 +209,7 @@ int CRYPTO_secure_allocated(const void *ptr)
#endif /* IMPLEMENTED */ #endif /* IMPLEMENTED */
} }
size_t CRYPTO_secure_used() size_t CRYPTO_secure_used(void)
{ {
#ifdef IMPLEMENTED #ifdef IMPLEMENTED
return secure_mem_used; return secure_mem_used;
@ -500,7 +500,7 @@ static int sh_init(size_t size, int minsize)
return 0; return 0;
} }
static void sh_done() static void sh_done(void)
{ {
OPENSSL_free(sh.freelist); OPENSSL_free(sh.freelist);
OPENSSL_free(sh.bittable); OPENSSL_free(sh.bittable);

View file

@ -14,7 +14,7 @@
#include "internal/poly1305.h" #include "internal/poly1305.h"
#include "poly1305_local.h" #include "poly1305_local.h"
size_t Poly1305_ctx_size () size_t Poly1305_ctx_size(void)
{ {
return sizeof(struct poly1305_context); return sizeof(struct poly1305_context);
} }

View file

@ -921,7 +921,7 @@ void rand_drbg_cleanup_int(void)
} }
} }
void drbg_delete_thread_state() void drbg_delete_thread_state(void)
{ {
RAND_DRBG *drbg; RAND_DRBG *drbg;

View file

@ -303,7 +303,7 @@ void rand_drbg_cleanup_additional_data(unsigned char *out, size_t outlen)
OPENSSL_secure_clear_free(out, outlen); OPENSSL_secure_clear_free(out, outlen);
} }
void rand_fork() void rand_fork(void)
{ {
rand_fork_count++; rand_fork_count++;
} }

View file

@ -18,7 +18,7 @@ DEFINE_RUN_ONCE_STATIC(do_store_init)
&& ossl_store_file_loader_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)) { if (!RUN_ONCE(&store_init, do_store_init)) {
OSSL_STOREerr(OSSL_STORE_F_OSSL_STORE_INIT_ONCE, ERR_R_MALLOC_FAILURE); OSSL_STOREerr(OSSL_STORE_F_OSSL_STORE_INIT_ONCE, ERR_R_MALLOC_FAILURE);

View file

@ -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 management functions. */
TS_RESP_CTX *TS_RESP_CTX_new() TS_RESP_CTX *TS_RESP_CTX_new(void)
{ {
TS_RESP_CTX *ctx; TS_RESP_CTX *ctx;

View file

@ -391,7 +391,7 @@ X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a)
return a->type; return a->type;
} }
X509_OBJECT *X509_OBJECT_new() X509_OBJECT *X509_OBJECT_new(void)
{ {
X509_OBJECT *ret = OPENSSL_zalloc(sizeof(*ret)); X509_OBJECT *ret = OPENSSL_zalloc(sizeof(*ret));

View file

@ -35,7 +35,7 @@ void pitem_free(pitem *item)
OPENSSL_free(item); OPENSSL_free(item);
} }
pqueue *pqueue_new() pqueue *pqueue_new(void)
{ {
pqueue *pq = OPENSSL_zalloc(sizeof(*pq)); pqueue *pq = OPENSSL_zalloc(sizeof(*pq));

View file

@ -42,7 +42,7 @@ struct async_ctrs {
unsigned int wctr; unsigned int wctr;
}; };
static const BIO_METHOD *bio_f_async_filter() static const BIO_METHOD *bio_f_async_filter(void)
{ {
if (methods_async == NULL) { if (methods_async == NULL) {
methods_async = BIO_meth_new(BIO_TYPE_ASYNC_FILTER, "Async filter"); methods_async = BIO_meth_new(BIO_TYPE_ASYNC_FILTER, "Async filter");

View file

@ -87,7 +87,7 @@ static int blockpause(void *args)
return 1; return 1;
} }
static int test_ASYNC_init_thread() static int test_ASYNC_init_thread(void)
{ {
ASYNC_JOB *job1 = NULL, *job2 = NULL, *job3 = NULL; ASYNC_JOB *job1 = NULL, *job2 = NULL, *job3 = NULL;
int funcret1, funcret2, funcret3; int funcret1, funcret2, funcret3;
@ -123,7 +123,7 @@ static int test_ASYNC_init_thread()
return 1; return 1;
} }
static int test_ASYNC_start_job() static int test_ASYNC_start_job(void)
{ {
ASYNC_JOB *job = NULL; ASYNC_JOB *job = NULL;
int funcret; int funcret;
@ -151,7 +151,7 @@ static int test_ASYNC_start_job()
return 1; return 1;
} }
static int test_ASYNC_get_current_job() static int test_ASYNC_get_current_job(void)
{ {
ASYNC_JOB *job = NULL; ASYNC_JOB *job = NULL;
int funcret; int funcret;
@ -178,7 +178,7 @@ static int test_ASYNC_get_current_job()
return 1; 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; ASYNC_JOB *job = NULL;
int funcret; int funcret;
@ -245,7 +245,7 @@ static int test_ASYNC_WAIT_CTX_get_all_fds()
return 1; return 1;
} }
static int test_ASYNC_block_pause() static int test_ASYNC_block_pause(void)
{ {
ASYNC_JOB *job = NULL; ASYNC_JOB *job = NULL;
int funcret; int funcret;

View file

@ -215,7 +215,7 @@ static int test_default_cipherlist_explicit(void)
return result; return result;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(test_default_cipherlist_implicit); ADD_TEST(test_default_cipherlist_implicit);
ADD_TEST(test_default_cipherlist_explicit); ADD_TEST(test_default_cipherlist_explicit);

View file

@ -554,7 +554,7 @@ static void reset_hook_ctx(HOOK_CTX *ctx)
} }
/* Resets all drbg hook contexts */ /* 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(&master_ctx);
reset_hook_ctx(&public_ctx); reset_hook_ctx(&public_ctx);

View file

@ -189,7 +189,7 @@ static int run_mtu_tests(void)
return ret; return ret;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(run_mtu_tests); ADD_TEST(run_mtu_tests);
return 1; return 1;

View file

@ -348,7 +348,7 @@ static int dtls_listen_test(int i)
} }
#endif #endif
int setup_tests() int setup_tests(void)
{ {
#ifndef OPENSSL_NO_SOCK #ifndef OPENSSL_NO_SOCK
ADD_ALL_TESTS(dtls_listen_test, (int)OSSL_NELEM(testpackets)); ADD_ALL_TESTS(dtls_listen_test, (int)OSSL_NELEM(testpackets));

View file

@ -2378,7 +2378,7 @@ static void free_key_list(KEY_LIST *lst)
/* /*
* Is the key type an unsupported algorithm? * Is the key type an unsupported algorithm?
*/ */
static int key_unsupported() static int key_unsupported(void)
{ {
long err = ERR_peek_error(); long err = ERR_peek_error();

View file

@ -127,7 +127,7 @@ typedef struct myobj_st {
int st; int st;
} MYOBJ; } MYOBJ;
static MYOBJ *MYOBJ_new() static MYOBJ *MYOBJ_new(void)
{ {
static int count = 0; static int count = 0;
MYOBJ *obj = OPENSSL_malloc(sizeof(*obj)); MYOBJ *obj = OPENSSL_malloc(sizeof(*obj));

View file

@ -27,7 +27,7 @@ print <<"_____";
# include <openssl/$name.h> # include <openssl/$name.h>
#endif #endif
int main() int main(void)
{ {
return 0; return 0;
} }

View file

@ -22,7 +22,7 @@
#include "handshake_helper.h" #include "handshake_helper.h"
#include "testutil.h" #include "testutil.h"
HANDSHAKE_RESULT *HANDSHAKE_RESULT_new() HANDSHAKE_RESULT *HANDSHAKE_RESULT_new(void)
{ {
HANDSHAKE_RESULT *ret; HANDSHAKE_RESULT *ret;

View file

@ -64,7 +64,7 @@ static int test_mdc2(int idx)
return 1; return 1;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_ALL_TESTS(test_mdc2, OSSL_NELEM(tests)); ADD_ALL_TESTS(test_mdc2, OSSL_NELEM(tests));
return 1; return 1;

View file

@ -99,7 +99,7 @@ static const SIZED_DATA aes_cts128_vectors[] = {
CTS128_TEST_VECTOR(64), 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 int init_key = 1;
static AES_KEY ks; static AES_KEY ks;
@ -111,7 +111,7 @@ static AES_KEY *cts128_encrypt_key_schedule()
return &ks; return &ks;
} }
static AES_KEY *cts128_decrypt_key_schedule() static AES_KEY *cts128_decrypt_key_schedule(void)
{ {
static int init_key = 1; static int init_key = 1;
static AES_KEY ks; static AES_KEY ks;

View file

@ -170,7 +170,7 @@ static int test_kdf_scrypt(void)
} }
#endif #endif
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(test_kdf_tls1_prf); ADD_TEST(test_kdf_tls1_prf);
ADD_TEST(test_kdf_hkdf); ADD_TEST(test_kdf_hkdf);

View file

@ -75,7 +75,7 @@ static int test_pkey_meths(void)
return good; return good;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(test_asn1_meths); ADD_TEST(test_asn1_meths);
ADD_TEST(test_pkey_meths); ADD_TEST(test_pkey_meths);

View file

@ -20,7 +20,7 @@
size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len); size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len);
size_t OPENSSL_ia32_rdseed_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]; extern unsigned int OPENSSL_ia32cap_P[4];
@ -81,12 +81,12 @@ end:
return testresult; 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); 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 * 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); return sanity_check_bytes(OPENSSL_ia32_rdseed_bytes, 1000, 1, 10000, 10);
} }
int setup_tests() { int setup_tests(void)
{
OPENSSL_cpuid_setup(); OPENSSL_cpuid_setup();
int have_rdseed = (OPENSSL_ia32cap_P[2] & (1 << 18)) != 0; int have_rdseed = (OPENSSL_ia32cap_P[2] & (1 << 18)) != 0;
@ -117,7 +118,7 @@ int setup_tests() {
#else #else
int setup_tests() int setup_tests(void)
{ {
return 1; return 1;
} }

View file

@ -76,7 +76,7 @@ static int test_ssl_cert_table(void)
return 1; return 1;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(test_ssl_cert_table); ADD_TEST(test_ssl_cert_table);
return 1; return 1;

View file

@ -709,7 +709,7 @@ static const ssl_test_server_option ssl_test_server_options[] = {
{ "SessionTicketAppData", &parse_server_session_ticket_app_data }, { "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; SSL_TEST_CTX *ret;

View file

@ -137,7 +137,7 @@ static void bio_f_tls_corrupt_filter_free(void)
*/ */
static const char **cipher_list = NULL; static const char **cipher_list = NULL;
static int setup_cipher_list() static int setup_cipher_list(void)
{ {
SSL_CTX *ctx = NULL; SSL_CTX *ctx = NULL;
SSL *ssl = NULL; SSL *ssl = NULL;

View file

@ -423,7 +423,7 @@ static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
return 1; return 1;
} }
static int verify_serverinfo() static int verify_serverinfo(void)
{ {
if (serverinfo_sct != serverinfo_sct_seen) if (serverinfo_sct != serverinfo_sct_seen)
return -1; return -1;
@ -2836,7 +2836,7 @@ static int app_verify_callback(X509_STORE_CTX *ctx, void *arg)
* $ openssl dhparam -C -noout -dsaparam 1024 * $ openssl dhparam -C -noout -dsaparam 1024
* (The third function has been renamed to avoid name conflicts.) * (The third function has been renamed to avoid name conflicts.)
*/ */
static DH *get_dh512() static DH *get_dh512(void)
{ {
static unsigned char dh512_p[] = { static unsigned char dh512_p[] = {
0xCB, 0xC8, 0xE1, 0x86, 0xD0, 0x1F, 0x94, 0x17, 0xA6, 0x99, 0xF0, 0xCB, 0xC8, 0xE1, 0x86, 0xD0, 0x1F, 0x94, 0x17, 0xA6, 0x99, 0xF0,
@ -2870,7 +2870,7 @@ static DH *get_dh512()
return dh; return dh;
} }
static DH *get_dh1024() static DH *get_dh1024(void)
{ {
static unsigned char dh1024_p[] = { static unsigned char dh1024_p[] = {
0xF8, 0x81, 0x89, 0x7D, 0x14, 0x24, 0xC5, 0xD1, 0xE6, 0xF7, 0xBF, 0xF8, 0x81, 0x89, 0x7D, 0x14, 0x24, 0xC5, 0xD1, 0xE6, 0xF7, 0xBF,
@ -2914,7 +2914,7 @@ static DH *get_dh1024()
return dh; return dh;
} }
static DH *get_dh1024dsa() static DH *get_dh1024dsa(void)
{ {
static unsigned char dh1024_p[] = { static unsigned char dh1024_p[] = {
0xC8, 0x00, 0xF7, 0x08, 0x07, 0x89, 0x4D, 0x90, 0x53, 0xF3, 0xD5, 0xC8, 0x00, 0xF7, 0x08, 0x07, 0x89, 0x4D, 0x90, 0x53, 0xF3, 0xD5,

View file

@ -106,7 +106,7 @@ static int test_offset(int idx)
return 1; return 1;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_ALL_TESTS(test_offset, OSSL_NELEM(tests)); ADD_ALL_TESTS(test_offset, OSSL_NELEM(tests));
return 1; return 1;

View file

@ -37,7 +37,7 @@ static int watchccs_puts(BIO *bp, const char *str);
static BIO_METHOD *method_watchccs = NULL; 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) { if (method_watchccs == NULL) {
method_watchccs = BIO_meth_new(BIO_TYPE_WATCHCCS_FILTER, method_watchccs = BIO_meth_new(BIO_TYPE_WATCHCCS_FILTER,

View file

@ -399,7 +399,7 @@ static int test_handshake_secrets(void)
return ret; return ret;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(test_handshake_secrets); ADD_TEST(test_handshake_secrets);
return 1; return 1;

View file

@ -251,7 +251,7 @@ static const struct set_name_fn name_fns[] = {
{set_altname_email, "set rfc822Name", 0, 1}, {set_altname_email, "set rfc822Name", 0, 1},
}; };
static X509 *make_cert() static X509 *make_cert(void)
{ {
X509 *crt = NULL; X509 *crt = NULL;

View file

@ -57,7 +57,7 @@ static int test_standard_exts(void)
return good; return good;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(test_standard_exts); ADD_TEST(test_standard_exts);
return 1; return 1;

View file

@ -482,7 +482,7 @@ static int test_x509_time_print(int idx)
return ret; return ret;
} }
int setup_tests() int setup_tests(void)
{ {
ADD_TEST(test_x509_cmp_time_current); ADD_TEST(test_x509_cmp_time_current);
ADD_ALL_TESTS(test_x509_cmp_time, OSSL_NELEM(x509_cmp_tests)); ADD_ALL_TESTS(test_x509_cmp_time, OSSL_NELEM(x509_cmp_tests));