Skip to content

Commit

Permalink
CLEANUP: ssl: move ssl_sock_gencert_load_ca declaration in ssl_gencert.h
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
einval22 authored and wlallemand committed Jan 24, 2025
1 parent 846819b commit 94d3b73
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions include/haproxy/ssl_gencert.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
2 changes: 0 additions & 2 deletions include/haproxy/ssl_sock.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 94d3b73

Please sign in to comment.