From 94d3b7375a3b84ddb8414d055254ba5193a38b48 Mon Sep 17 00:00:00 2001 From: Valentine Krasnobaeva Date: Thu, 23 Jan 2025 15:58:57 +0100 Subject: [PATCH] CLEANUP: ssl: move ssl_sock_gencert_load_ca declaration in ssl_gencert.h As ssl_sock_gencert_load_ca and ssl_sock_gencert_free_ca are compiled only if SSL_NO_GENERATE_CERTIFICATES is not defined, let's align it and move these declarations in ssl_gencert.h. --- include/haproxy/ssl_gencert.h | 2 ++ include/haproxy/ssl_sock.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/haproxy/ssl_gencert.h b/include/haproxy/ssl_gencert.h index 9065934bf51e4..686b2d5bc3211 100644 --- a/include/haproxy/ssl_gencert.h +++ b/include/haproxy/ssl_gencert.h @@ -30,6 +30,8 @@ SSL_CTX *ssl_sock_assign_generated_cert(unsigned int key, struct bind_conf *bind SSL_CTX *ssl_sock_get_generated_cert(unsigned int key, struct bind_conf *bind_conf); int ssl_sock_set_generated_cert(SSL_CTX *ctx, unsigned int key, struct bind_conf *bind_conf); unsigned int ssl_sock_generated_cert_key(const void *data, size_t len); +int ssl_sock_gencert_load_ca(struct bind_conf *bind_conf); +void ssl_sock_gencert_free_ca(struct bind_conf *bind_conf); #endif /* USE_OPENSSL */ #endif /* _HAPROXY_SSL_GENCERT_H */ diff --git a/include/haproxy/ssl_sock.h b/include/haproxy/ssl_sock.h index fba5353f5cfc6..34d8d83b43f1b 100644 --- a/include/haproxy/ssl_sock.h +++ b/include/haproxy/ssl_sock.h @@ -68,8 +68,6 @@ void ssl_sock_free_srv_ctx(struct server *srv); void ssl_sock_free_all_ctx(struct bind_conf *bind_conf); int ssl_sock_get_alpn(const struct connection *conn, void *xprt_ctx, const char **str, int *len); -int ssl_sock_gencert_load_ca(struct bind_conf *bind_conf); -void ssl_sock_gencert_free_ca(struct bind_conf *bind_conf); int ssl_bio_and_sess_init(struct connection *conn, SSL_CTX *ssl_ctx, SSL **ssl, BIO **bio, BIO_METHOD *bio_meth, void *ctx); const char *ssl_sock_get_sni(struct connection *conn);