From 000694cf9665c0e8b0125f3ca273a05b0e446622 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Thu, 23 May 2019 14:45:12 +0200 Subject: [PATCH] MINOR: ssl: Make ssl_sock_handshake() static. ssl_sock_handshake is now only used by the ssl code itself, there's no need to export it anymore, so make it static. --- include/proto/ssl_sock.h | 1 - src/ssl_sock.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/proto/ssl_sock.h b/include/proto/ssl_sock.h index 23507ca5e..d6d01a7a2 100644 --- a/include/proto/ssl_sock.h +++ b/include/proto/ssl_sock.h @@ -45,7 +45,6 @@ int ssl_sock_is_ssl(struct connection *conn) return 1; } -int ssl_sock_handshake(struct connection *conn, unsigned int flag); int ssl_sock_prepare_ctx(struct bind_conf *bind_conf, struct ssl_bind_conf *, SSL_CTX *ctx); int ssl_sock_prepare_all_ctx(struct bind_conf *bind_conf); int ssl_sock_prepare_bind_conf(struct bind_conf *bind_conf); diff --git a/src/ssl_sock.c b/src/ssl_sock.c index cc6f3b50e..201f04c20 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -225,6 +225,7 @@ struct ssl_sock_ctx { DECLARE_STATIC_POOL(ssl_sock_ctx_pool, "ssl_sock_ctx_pool", sizeof(struct ssl_sock_ctx)); static struct task *ssl_sock_io_cb(struct task *, void *, unsigned short); +static int ssl_sock_handshake(struct connection *conn, unsigned int flag); /* Methods to implement OpenSSL BIO */ static int ha_ssl_write(BIO *h, const char *buf, int num) @@ -5283,7 +5284,7 @@ err: * otherwise it returns non-zero and removes itself from the connection's * flags (the bit is provided in by the caller). */ -int ssl_sock_handshake(struct connection *conn, unsigned int flag) +static int ssl_sock_handshake(struct connection *conn, unsigned int flag) { struct ssl_sock_ctx *ctx = conn->xprt_ctx; int ret;