buf-t and ebmbtree were included.
/*
- * include/types/ssl_ckch.h
+ * include/haproxy/ssl_ckch-t.h
* ckch structures
*
* Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
*/
-#ifndef _TYPES_SSL_CKCH_H
-#define _TYPES_SSL_CKCH_H
+#ifndef _HAPROXY_SSL_CKCH_T_H
+#define _HAPROXY_SSL_CKCH_T_H
#ifdef USE_OPENSSL
+#include <import/ebmbtree.h>
+#include <haproxy/buf-t.h>
#include <haproxy/list-t.h>
#include <haproxy/openssl-compat.h>
};
#endif /* USE_OPENSSL */
-#endif /* _TYPES_SSL_CKCH_H */
+#endif /* _HAPROXY_SSL_CKCH_T_H */
/*
- * include/proto/ssl_ckch.h
+ * include/haproxy/ssl_ckch.h
* ckch function prototypes
*
* Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_SSL_CKCH_H
-#define _PROTO_SSL_CKCH_H
+#ifndef _HAPROXY_SSL_CKCH_H
+#define _HAPROXY_SSL_CKCH_H
#ifdef USE_OPENSSL
+#include <haproxy/ssl_ckch-t.h>
+
/* cert_key_and_chain functions */
int ssl_sock_load_files_into_ckch(const char *path, struct cert_key_and_chain *ckch, char **err);
struct ssl_bind_conf *ssl_conf, char **sni_filter, int fcount, struct ckch_inst **ckchi, char **err);
#endif /* USE_OPENSSL */
-#endif /* _PROTO_SSL_CRTLIST_H */
+#endif /* _HAPROXY_SSL_CRTLIST_H */
#include <import/eb64tree.h>
#include <types/connection.h> /* struct wait_event */
-#include <types/ssl_ckch.h>
#include <types/ssl_crtlist.h>
#include <haproxy/buf-t.h>
#include <haproxy/thread.h>
#include <haproxy/list-t.h>
#include <haproxy/openssl-compat.h>
+#include <haproxy/ssl_ckch-t.h>
/* ***** READ THIS before adding code here! *****
*
#include <haproxy/base64.h>
#include <haproxy/errors.h>
+#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
#include <import/ebsttree.h>
#include <types/cli.h>
-#include <types/ssl_ckch.h>
#include <types/ssl_sock.h>
#include <proto/cli.h>
#include <proto/channel.h>
-#include <proto/ssl_ckch.h>
#include <proto/ssl_sock.h>
#include <proto/stream_interface.h>
#include <sys/types.h>
#include <haproxy/errors.h>
+#include <haproxy/ssl_ckch.h>
#include <haproxy/tools.h>
#include <dirent.h>
#include <types/cli.h>
#include <types/ssl_crtlist.h>
-#include <types/ssl_ckch.h>
#include <types/ssl_sock.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <proto/stream_interface.h>
#include <proto/ssl_crtlist.h>
-#include <proto/ssl_ckch.h>
#include <proto/ssl_sock.h>
/* release ssl bind conf */
#include <haproxy/http_rules.h>
#include <haproxy/openssl-compat.h>
#include <haproxy/shctx.h>
+#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
#include <proto/stream_interface.h>
#include <proto/log.h>
#include <proto/proxy.h>
-#include <proto/ssl_ckch.h>
#include <proto/ssl_crtlist.h>
#include <proto/ssl_sock.h>
#include <proto/stream.h>