From 50d191b8a3dcb54854413aa8ea6097db74fe6277 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Thu, 11 Sep 2025 15:23:59 +0200 Subject: [PATCH] MINOR: ssl: set functions as static when no protypes in the .h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Check with -Wmissing-prototypes what should be static. src/ssl_sock.c:1572:5: error: no previous prototype for ‘ssl_sock_sctl_add_cbk’ [-Werror=missing-prototypes] 1572 | int ssl_sock_sctl_add_cbk(SSL *ssl, unsigned ext_type, const unsigned char **out, size_t *outlen, int *al, void *add_arg) | ^~~~~~~~~~~~~~~~~~~~~ src/ssl_sock.c:1582:5: error: no previous prototype for ‘ssl_sock_sctl_parse_cbk’ [-Werror=missing-prototypes] 1582 | int ssl_sock_sctl_parse_cbk(SSL *s, unsigned int ext_type, const unsigned char *in, size_t inlen, int *al, void *parse_arg) | ^~~~~~~~~~~~~~~~~~~~~~~ src/ssl_sock.c:1604:6: error: no previous prototype for ‘ssl_sock_infocbk’ [-Werror=missing-prototypes] 1604 | void ssl_sock_infocbk(const SSL *ssl, int where, int ret) | ^~~~~~~~~~~~~~~~ src/ssl_sock.c:2107:6: error: no previous prototype for ‘ssl_sock_msgcbk’ [-Werror=missing-prototypes] 2107 | void ssl_sock_msgcbk(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg) | ^~~~~~~~~~~~~~~ src/ssl_sock.c:3936:5: error: no previous prototype for ‘sh_ssl_sess_new_cb’ [-Werror=missing-prototypes] 3936 | int sh_ssl_sess_new_cb(SSL *ssl, SSL_SESSION *sess) | ^~~~~~~~~~~~~~~~~~ src/ssl_sock.c:3990:14: error: no previous prototype for ‘sh_ssl_sess_get_cb’ [-Werror=missing-prototypes] 3990 | SSL_SESSION *sh_ssl_sess_get_cb(SSL *ssl, __OPENSSL_110_CONST__ unsigned char *key, int key_len, int *do_copy) | ^~~~~~~~~~~~~~~~~~ src/ssl_sock.c:4043:6: error: no previous prototype for ‘sh_ssl_sess_remove_cb’ [-Werror=missing-prototypes] 4043 | void sh_ssl_sess_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess) | ^~~~~~~~~~~~~~~~~~~~~ src/ssl_sock.c:4075:6: error: no previous prototype for ‘ssl_set_shctx’ [-Werror=missing-prototypes] 4075 | void ssl_set_shctx(SSL_CTX *ctx) | ^~~~~~~~~~~~~ src/ssl_sock.c:4103:6: error: no previous prototype for ‘SSL_CTX_keylog’ [-Werror=missing-prototypes] 4103 | void SSL_CTX_keylog(const SSL *ssl, const char *line) | ^~~~~~~~~~~~~~ src/ssl_sock.c:5167:6: error: no previous prototype for ‘ssl_sock_deinit’ [-Werror=missing-prototypes] 5167 | void ssl_sock_deinit() | ^~~~~~~~~~~~~~~ src/ssl_sock.c:6976:6: error: no previous prototype for ‘ssl_sock_close’ [-Werror=missing-prototypes] 6976 | void ssl_sock_close(struct connection *conn, void *xprt_ctx) { | ^~~~~~~~~~~~~~ src/ssl_sock.c:7846:17: error: no previous prototype for ‘ssl_action_wait_for_hs’ [-Werror=missing-prototypes] 7846 | enum act_return ssl_action_wait_for_hs(struct act_rule *rule, struct proxy *px, | ^~~~~~~~~~~~~~~~~~~~~~ --- src/ssl_sock.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index c6bfcf5e3..34bb1e952 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -1569,7 +1569,7 @@ static int ssl_sock_load_ocsp(const char *path, SSL_CTX *ctx, struct ckch_data * int sctl_ex_index = -1; -int ssl_sock_sctl_add_cbk(SSL *ssl, unsigned ext_type, const unsigned char **out, size_t *outlen, int *al, void *add_arg) +static int ssl_sock_sctl_add_cbk(SSL *ssl, unsigned ext_type, const unsigned char **out, size_t *outlen, int *al, void *add_arg) { struct buffer *sctl = add_arg; @@ -1579,7 +1579,7 @@ int ssl_sock_sctl_add_cbk(SSL *ssl, unsigned ext_type, const unsigned char **out return 1; } -int ssl_sock_sctl_parse_cbk(SSL *s, unsigned int ext_type, const unsigned char *in, size_t inlen, int *al, void *parse_arg) +static int ssl_sock_sctl_parse_cbk(SSL *s, unsigned int ext_type, const unsigned char *in, size_t inlen, int *al, void *parse_arg) { return 1; } @@ -1601,7 +1601,7 @@ out: #endif -void ssl_sock_infocbk(const SSL *ssl, int where, int ret) +static void ssl_sock_infocbk(const SSL *ssl, int where, int ret) { struct connection *conn; struct ssl_sock_ctx *ctx = NULL; @@ -2104,7 +2104,7 @@ static void ssl_init_keylog(struct connection *conn, int write_p, int version, #endif /* Callback is called for ssl protocol analyse */ -void ssl_sock_msgcbk(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg) +static void ssl_sock_msgcbk(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg) { struct connection *conn = ssl_sock_get_conn(ssl, NULL); struct ssl_sock_msg_callback *cbk; @@ -3933,7 +3933,7 @@ static int ssl_sess_new_srv_cb(SSL *ssl, SSL_SESSION *sess) /* SSL callback used on new session creation */ -int sh_ssl_sess_new_cb(SSL *ssl, SSL_SESSION *sess) +static int sh_ssl_sess_new_cb(SSL *ssl, SSL_SESSION *sess) { unsigned char encsess[SHSESS_MAX_DATA_LEN]; /* encoded session */ unsigned char encid[SSL_MAX_SSL_SESSION_ID_LENGTH]; /* encoded id */ @@ -3987,7 +3987,7 @@ err: } /* SSL callback used on lookup an existing session cause none found in internal cache */ -SSL_SESSION *sh_ssl_sess_get_cb(SSL *ssl, __OPENSSL_110_CONST__ unsigned char *key, int key_len, int *do_copy) +static SSL_SESSION *sh_ssl_sess_get_cb(SSL *ssl, __OPENSSL_110_CONST__ unsigned char *key, int key_len, int *do_copy) { struct sh_ssl_sess_hdr *sh_ssl_sess; unsigned char data[SHSESS_MAX_DATA_LEN], *p; @@ -4040,7 +4040,7 @@ SSL_SESSION *sh_ssl_sess_get_cb(SSL *ssl, __OPENSSL_110_CONST__ unsigned char *k /* SSL callback used to signal session is no more used in internal cache */ -void sh_ssl_sess_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess) +static void sh_ssl_sess_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess) { struct sh_ssl_sess_hdr *sh_ssl_sess; unsigned char tmpkey[SSL_MAX_SSL_SESSION_ID_LENGTH]; @@ -4072,7 +4072,7 @@ void sh_ssl_sess_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess) /* Set session cache mode to server and disable openssl internal cache. * Set shared cache callbacks on an ssl context. * Shared context MUST be firstly initialized */ -void ssl_set_shctx(SSL_CTX *ctx) +static void ssl_set_shctx(SSL_CTX *ctx) { SSL_CTX_set_session_id_context(ctx, (const unsigned char *)SHCTX_APPNAME, strlen(SHCTX_APPNAME)); @@ -4100,7 +4100,7 @@ void ssl_set_shctx(SSL_CTX *ctx) */ #ifdef HAVE_SSL_KEYLOG -void SSL_CTX_keylog(const SSL *ssl, const char *line) +static void SSL_CTX_keylog(const SSL *ssl, const char *line) { struct ssl_keylog *keylog; char *lastarg = NULL; @@ -5164,7 +5164,7 @@ void ssl_sock_free_all_ctx(struct bind_conf *bind_conf) } -void ssl_sock_deinit() +static void ssl_sock_deinit() { crtlist_deinit(); /* must be free'd before the ckchs */ ckch_deinit(); @@ -6973,7 +6973,7 @@ static size_t ssl_sock_from_buf(struct connection *conn, void *xprt_ctx, const s goto leave; } -void ssl_sock_close(struct connection *conn, void *xprt_ctx) { +static void ssl_sock_close(struct connection *conn, void *xprt_ctx) { struct ssl_sock_ctx *ctx = xprt_ctx; @@ -7843,7 +7843,7 @@ struct xprt_ops ssl_sock = { .show_fd = ssl_sock_show_fd, }; -enum act_return ssl_action_wait_for_hs(struct act_rule *rule, struct proxy *px, +static enum act_return ssl_action_wait_for_hs(struct act_rule *rule, struct proxy *px, struct session *sess, struct stream *s, int flags) { struct connection *conn; -- 2.47.3