From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 12:21:22 +0000 (+0200)
Subject: REORG: include: move ssl_utils.h to haproxy/ssl_utils.h
X-Git-Tag: v2.2-dev9~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2bd865804f7fa9551832ff6f75119cf6de4bfda;p=thirdparty%2Fhaproxy.git

REORG: include: move ssl_utils.h to haproxy/ssl_utils.h

Just added buf-t and openssl-compat for the missing types that appear
in the prototypes.
---

diff --git a/include/proto/ssl_utils.h b/include/haproxy/ssl_utils.h
similarity index 88%
rename from include/proto/ssl_utils.h
rename to include/haproxy/ssl_utils.h
index be14a0d1bc..2ebe034a34 100644
--- a/include/proto/ssl_utils.h
+++ b/include/haproxy/ssl_utils.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/ssl_utils.h
+ * include/haproxy/ssl_utils.h
  *
  * Utility functions for SSL:
  * Mostly generic functions that retrieve information from certificates
@@ -22,10 +22,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_SSL_UTILS_H
-#define _TYPES_SSL_UTILS_H
+#ifndef _HAPROXY_SSL_UTILS_H
+#define _HAPROXY_SSL_UTILS_H
+
 #ifdef USE_OPENSSL
 
+#include <haproxy/buf-t.h>
+#include <haproxy/openssl-compat.h>
+
 int cert_get_pkey_algo(X509 *crt, struct buffer *out);
 int ssl_sock_get_serial(X509 *crt, struct buffer *out);
 int ssl_sock_crt2der(X509 *crt, struct buffer *out);
@@ -35,6 +39,6 @@ int ssl_sock_get_dn_entry(X509_NAME *a, const struct buffer *entry, int pos,
 int ssl_sock_get_dn_formatted(X509_NAME *a, const struct buffer *format, struct buffer *out);
 int ssl_sock_get_dn_oneline(X509_NAME *a, struct buffer *out);
 
-#endif /* _TYPES_SSL_UTILS_H */
+#endif /* _HAPROXY_SSL_UTILS_H */
 #endif /* USE_OPENSSL */
 
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 61dd353846..1fc0d18d1e 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -23,6 +23,7 @@
 
 #include <haproxy/base64.h>
 #include <haproxy/errors.h>
+#include <haproxy/ssl_utils.h>
 #include <haproxy/tools.h>
 
 #include <import/ebsttree.h>
@@ -35,7 +36,6 @@
 #include <proto/channel.h>
 #include <proto/ssl_ckch.h>
 #include <proto/ssl_sock.h>
-#include <proto/ssl_utils.h>
 #include <proto/stream_interface.h>
 
 /* Uncommitted CKCH transaction */
diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 5462dba54c..f27b2e6b50 100644
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -24,6 +24,7 @@
 #include <haproxy/buf-t.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/openssl-compat.h>
+#include <haproxy/ssl_utils.h>
 #include <haproxy/tools.h>
 
 #include <types/sample.h>
@@ -32,7 +33,6 @@
 #include <proto/acl.h>
 #include <haproxy/arg.h>
 #include <proto/ssl_sock.h>
-#include <proto/ssl_utils.h>
 #include <proto/sample.h>
 
 
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 6f0f399c18..4f57f75bf7 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -51,6 +51,7 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/shctx.h>
+#include <haproxy/ssl_utils.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -83,7 +84,6 @@
 #include <proto/ssl_ckch.h>
 #include <proto/ssl_crtlist.h>
 #include <proto/ssl_sock.h>
-#include <proto/ssl_utils.h>
 #include <proto/stream.h>
 #include <proto/task.h>
 #include <proto/vars.h>