]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REORG: include: move ssl_ckch.h to haproxy/ssl_ckch{,-t}.h
authorWilly Tarreau <w@1wt.eu>
Thu, 4 Jun 2020 12:25:47 +0000 (14:25 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 11 Jun 2020 08:18:58 +0000 (10:18 +0200)
buf-t and ebmbtree were included.

include/haproxy/ssl_ckch-t.h [moved from include/types/ssl_ckch.h with 94% similarity]
include/haproxy/ssl_ckch.h [moved from include/proto/ssl_ckch.h with 94% similarity]
include/types/ssl_sock.h
src/ssl_ckch.c
src/ssl_crtlist.c
src/ssl_sock.c

similarity index 94%
rename from include/types/ssl_ckch.h
rename to include/haproxy/ssl_ckch-t.h
index a4108104b5ea33e18d4ca42b19397d1b4352210c..d102887af79b7cde574b8d6ac62b4a6d8673e073 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * 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>
 
@@ -93,4 +95,4 @@ struct ckch_inst {
 };
 
 #endif /* USE_OPENSSL */
-#endif /* _TYPES_SSL_CKCH_H */
+#endif /* _HAPROXY_SSL_CKCH_T_H */
similarity index 94%
rename from include/proto/ssl_ckch.h
rename to include/haproxy/ssl_ckch.h
index d0df9b9ac6a63300c90723c3778bb9f33d1e7165..919389d6c0724ec6f859b5d090b0603f57d2f5f4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * 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);
@@ -60,4 +62,4 @@ int ckch_inst_new_load_store(const char *path, struct ckch_store *ckchs, struct
                              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 */
index ca41ffc2c009d3865106baed44059031f0199b04..bea2a1603f548b3d9df42c2cc8f4e4111d1e715a 100644 (file)
 #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! *****
  *
index 1fc0d18d1e940a19e32d547a98600125bf80e512..5b1b4e10e86de5b250d5b7ed47257783d16f2e77 100644 (file)
 
 #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>
 
index e7c394cc57922bc0e6c615924d42bcc2cf72088b..d8362259a2185a9312e9612535a8e40b4ae9f522 100644 (file)
@@ -16,6 +16,7 @@
 #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 */
index 4f57f75bf7f3c79444a6e74a247152c5a1ae1982..86eede3510b8f68711e23035a40a84daa40e18be 100644 (file)
@@ -51,6 +51,7 @@
 #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>
@@ -81,7 +82,6 @@
 #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>