mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: Make ssl_sock_handshake() static.

Browse Source 
ssl_sock_handshake is now only used by the ssl code itself, there's no need
to export it anymore, so make it static.
This commit is contained in:
Olivier Houchard 2019-05-23 14:45:12 +02:00 committed by Olivier Houchard
parent ea8dd949e4
commit 000694cf96
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/ssl_sock.h
View File

@ -45,7 +45,6 @@ int ssl_sock_is_ssl(struct connection *conn)
return 1; 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_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_all_ctx(struct bind_conf *bind_conf);
int ssl_sock_prepare_bind_conf(struct bind_conf *bind_conf); int ssl_sock_prepare_bind_conf(struct bind_conf *bind_conf);

3
src/ssl_sock.c
View File

@ -225,6 +225,7 @@ struct ssl_sock_ctx {
DECLARE_STATIC_POOL(ssl_sock_ctx_pool, "ssl_sock_ctx_pool", sizeof(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 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 */ /* Methods to implement OpenSSL BIO */
static int ha_ssl_write(BIO *h, const char *buf, int num) 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 * otherwise it returns non-zero and removes itself from the connection's
* flags (the bit is provided in <flag> by the caller). * 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; struct ssl_sock_ctx *ctx = conn->xprt_ctx;
int ret; int ret;