From 52d88725ab3843b7cfaf30726242a334930b1097 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 14:29:23 +0200
Subject: [PATCH] REORG: move ssl_crtlist.h to haproxy/ssl_crtlist{,-t}.h

These files were already clean as well. Just added ebptnode which is
needed in crtlist_entry.
---
 .../{types/ssl_crtlist.h => haproxy/ssl_crtlist-t.h}   |  9 +++++----
 include/{proto => haproxy}/ssl_crtlist.h               | 10 +++++-----
 include/types/ssl_sock.h                               |  2 +-
 src/ssl_crtlist.c                                      |  3 +--
 src/ssl_sock.c                                         |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename include/{types/ssl_crtlist.h => haproxy/ssl_crtlist-t.h} (92%)
 rename include/{proto => haproxy}/ssl_crtlist.h (90%)

diff --git a/include/types/ssl_crtlist.h b/include/haproxy/ssl_crtlist-t.h
similarity index 92%
rename from include/types/ssl_crtlist.h
rename to include/haproxy/ssl_crtlist-t.h
index ed8c135aec..6ca48b5d92 100644
--- a/include/types/ssl_crtlist.h
+++ b/include/haproxy/ssl_crtlist-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/ssl_crtlist.h
+ * include/haproxy/ssl_crtlist-t.h
  * crt-list structures
  *
  * Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
@@ -19,11 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_SSL_CRTLIST_H
-#define _TYPES_SSL_CRTLIST_H
+#ifndef _HAPROXY_SSL_CRTLIST_T_H
+#define _HAPROXY_SSL_CRTLIST_T_H
 #ifdef USE_OPENSSL
 
 #include <import/ebmbtree.h>
+#include <import/ebpttree.h>
 
 #include <haproxy/list-t.h>
 
@@ -61,4 +62,4 @@ struct crtlist_entry {
 };
 
 #endif /* USE_OPENSSL */
-#endif /* _TYPES_SSL_CRTLIST_H */
+#endif /* _HAPROXY_SSL_CRTLIST_T_H */
diff --git a/include/proto/ssl_crtlist.h b/include/haproxy/ssl_crtlist.h
similarity index 90%
rename from include/proto/ssl_crtlist.h
rename to include/haproxy/ssl_crtlist.h
index 5b75ac7aa0..1650ddc323 100644
--- a/include/proto/ssl_crtlist.h
+++ b/include/haproxy/ssl_crtlist.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/ssl_crtlist.h
+ * include/haproxy/ssl_crtlist.h
  * crt-list function prototyes
  *
  * Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_SSL_CRTLIST_H
-#define _PROTO_SSL_CRTLIST_H
+#ifndef _HAPROXY_SSL_CRTLIST_H
+#define _HAPROXY_SSL_CRTLIST_H
 #ifdef USE_OPENSSL
 
-#include <types/ssl_crtlist.h>
+#include <haproxy/ssl_crtlist-t.h>
 
 
 /* crt-list entry functions */
@@ -42,4 +42,4 @@ int crtlist_parse_line(char *line, char **crt_path, struct crtlist_entry *entry,
 int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct proxy *curproxy, struct crtlist **crtlist, char **err);
 int crtlist_load_cert_dir(char *path, struct bind_conf *bind_conf, struct crtlist **crtlist, char **err);
 #endif /* USE_OPENSSL */
-#endif /* _PROTO_SSL_CRTLIST_H */
+#endif /* _HAPROXY_SSL_CRTLIST_H */
diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index bea2a1603f..b535e4d3b3 100644
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -28,13 +28,13 @@
 #include <import/eb64tree.h>
 
 #include <types/connection.h> /* struct wait_event */
-#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>
+#include <haproxy/ssl_crtlist-t.h>
 
 /* ***** READ THIS before adding code here! *****
  *
diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index d8362259a2..9d0e1e7c5e 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -17,6 +17,7 @@
 
 #include <haproxy/errors.h>
 #include <haproxy/ssl_ckch.h>
+#include <haproxy/ssl_crtlist.h>
 #include <haproxy/tools.h>
 
 #include <dirent.h>
@@ -24,13 +25,11 @@
 #include <import/ebsttree.h>
 
 #include <types/cli.h>
-#include <types/ssl_crtlist.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_sock.h>
 
 /* release ssl bind conf */
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 86eede3510..efab3af012 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -52,6 +52,7 @@
 #include <haproxy/openssl-compat.h>
 #include <haproxy/shctx.h>
 #include <haproxy/ssl_ckch.h>
+#include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_utils.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
@@ -82,7 +83,6 @@
 #include <proto/stream_interface.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
-#include <proto/ssl_crtlist.h>
 #include <proto/ssl_sock.h>
 #include <proto/stream.h>
 #include <proto/task.h>
-- 
2.47.3