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.

diff --git a/include/common/openssl-compat.h b/include/haproxy/openssl-compat.h
similarity index 98%
rename from include/common/openssl-compat.h
rename to include/haproxy/openssl-compat.h
index 25b1edec59f1fdf385092c6ffa4c157ca31fc508..34fe6cb76e75ea90bfd3c56336360ddb1928c24d 100644 (file)
--- a/include/common/openssl-compat.h
+++ b/include/haproxy/openssl-compat.h
@@ -1,5 +1,5 @@
-#ifndef _COMMON_OPENSSL_COMPAT_H
-#define _COMMON_OPENSSL_COMPAT_H
+#ifndef _HAPROXY_OPENSSL_COMPAT_H
+#define _HAPROXY_OPENSSL_COMPAT_H
 #ifdef USE_OPENSSL
 
 #include <openssl/bn.h>
@@ -379,4 +379,4 @@ static inline void SSL_CTX_up_ref(SSL_CTX *ctx)
 #endif
 
 #endif /* USE_OPENSSL */
-#endif /* _COMMON_OPENSSL_COMPAT_H */
+#endif /* _HAPROXY_OPENSSL_COMPAT_H */

diff --git a/include/proto/ssl_sock.h b/include/proto/ssl_sock.h
index 101d86810fa6b766658ff66efb0517056709fe0f..6966512136ef240fc93a0b69ca3a7f950dc7d4f9 100644 (file)
--- a/include/proto/ssl_sock.h
+++ b/include/proto/ssl_sock.h
@@ -23,7 +23,7 @@
 #define _PROTO_SSL_SOCK_H
 #ifdef USE_OPENSSL
 
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <types/connection.h>
 #include <types/listener.h>

diff --git a/include/types/listener.h b/include/types/listener.h
index cbd4bab1785c5b856f966997ca91ca2808629171..7374dc8f8d8c8a8a5f7d63213937bb5c64b2286d 100644 (file)
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -27,7 +27,7 @@
 
 #ifdef USE_OPENSSL
 #include <haproxy/api-t.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 #endif
 
 #include <common/mini-clist.h>

diff --git a/include/types/server.h b/include/types/server.h
index 70a6e82ac1338b956d8992a8efe15d9849378e40..c8e5bb69bcdc96d9a285e8f29a3a2f6cf17d95da 100644 (file)
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -28,7 +28,7 @@
 #include <haproxy/api-t.h>
 #include <common/mini-clist.h>
 #include <common/hathreads.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 #include <import/eb32tree.h>
 

diff --git a/include/types/ssl_ckch.h b/include/types/ssl_ckch.h
index db59bb7ee17bf5eb4711bc3b7cf7af14a3969434..a63ec1d1eff733df1ea0871dce31949279bdc08b 100644 (file)
--- a/include/types/ssl_ckch.h
+++ b/include/types/ssl_ckch.h
@@ -34,7 +34,7 @@
 #ifdef USE_OPENSSL
 
 #include <common/mini-clist.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 /* This is used to preload the certificate, private key
  * and Cert Chain of a file passed in via the crt

diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index aed6e6ce863c15348b38b65ba2af8de6f03553ce..be58aa8c27b370c6ab3d26762e32eb90517400b2 100644 (file)
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -34,7 +34,7 @@
 #include <common/buffer.h>
 #include <common/hathreads.h>
 #include <common/mini-clist.h>
-#include <common/openssl-compat.h>
+#include <haproxy/openssl-compat.h>
 
 /* ***** READ THIS before adding code here! *****
  *

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index 3d1f676d11d308ad68b84133575b56475f891a25..c93c51a47e988356cc322fa48c09cc41b93cd7f9 100644 (file)
--- 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>
 

diff --git a/src/haproxy.c b/src/haproxy.c
index d2bb0de64d7c2b17583865594a0b9bf73393178d..79a28acb62bf849505d1b5b503d1fabed44496e0 100644 (file)
--- 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>

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 85703d54828caa07264b351e9f43b812c57f3ed1..8bc78e1c686798f09767f95b3bdc84893ef56732 100644 (file)
--- 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>

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 39e4f22d2d2169dbcd30fd68e209eab42bf9bbfe..d11eaaf197cae64c4f67a693de7675cbcc813e13 100644 (file)
--- 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>

diff --git a/src/ssl_utils.c b/src/ssl_utils.c
index 76c5137417e20e712dd94827e87fe1ae10953da9..10b71d565294008f74c37ea4b6da7114fc686cb7 100644 (file)
--- 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>