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.

diff --git a/include/proto/ssl_sock.h b/include/proto/ssl_sock.h
index 23507ca5e289f5c23a75021b6d0f61b8d29f9c1c..d6d01a7a27859292c7c0972b248717bc7a042a00 100644 (file)
--- 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 cc6f3b50ec080ae32de68fcdbc26781d9b87bef1..201f04c206bccec5f9b52240a033b5c3dd7ceb2c 100644 (file)
--- 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 <flag> 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;