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.

diff --git a/include/haproxy/ssl_gencert.h b/include/haproxy/ssl_gencert.h
index 9065934bf51e4f3bb0cb392db19c9fbe85c55c22..686b2d5bc3211543f1402ca48c692930d772aa4c 100644 (file)
--- 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 fba5353f5cfc6803f1c0c2b3e736b3fa5586458d..34d8d83b43f1b1a3fb606cdbbca32efc08f6919d 100644 (file)
--- 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);