commit 6019faba50374b983245344217ee161fe298a1b6
author Willy Tarreau <w@1wt.eu> Wed May 27 16:26:00 2020 +0200
committer Willy Tarreau <w@1wt.eu> Thu Jun 11 10:18:56 2020 +0200
tree 42b48c59f02a1fa3394fd54fae54e4e6c76b98f1
parent 8d36697deea8e4c87202a94505b238174334ea40

REORG: include: move openssl-compat.h from common/ to haproxy/

This file is to openssl what compat.h is to the libc, so it makes sense
to move it to haproxy/. It could almost be part of api.h but given the
amount of openssl stuff that gets loaded I fear it could increase the
build time.

Note that this file contains lots of inlined functions. But since it
does not depend on anything else in haproxy, it remains safe to keep
all that together.

src/cfgparse-ssl.c

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index 3d1f676..c93c51a 100644
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -34,7 +34,7 @@
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <common/cfgparse.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <types/ssl_sock.h>
 

src/haproxy.c

diff --git a/src/haproxy.c b/src/haproxy.c
index d2bb0de..79a28ac 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -89,7 +89,7 @@
 #include <common/mini-clist.h>
 #include <common/namespace.h>
 #include <common/net_helper.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #include <common/regex.h>
 #include <common/standard.h>
 #include <common/time.h>

src/ssl_sample.c

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 85703d5..8bc78e1 100644
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -22,7 +22,7 @@
 
 #include <haproxy/api.h>
 #include <common/buffer.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #include <common/standard.h>
 
 #include <types/sample.h>

src/ssl_sock.c

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 39e4f22..d11eaaf 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -48,7 +48,7 @@
 #include <common/chunk.h>
 #include <common/debug.h>
 #include <haproxy/errors.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>

src/ssl_utils.c

diff --git a/src/ssl_utils.c b/src/ssl_utils.c
index 76c5137..10b71d5 100644
--- a/src/ssl_utils.c
+++ b/src/ssl_utils.c
@@ -13,7 +13,7 @@
 
 
 #include <common/buffer.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <proto/ssl_sock.h>