From: Willy Tarreau <w@1wt.eu>
Date: Thu, 9 May 2019 12:52:44 +0000 (+0200)
Subject: REORG: ssl: move openssl-compat from proto to common
X-Git-Tag: v2.0-dev3~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5599456ee2355509c45f1825e17b3fd233f0b8b4;p=thirdparty%2Fhaproxy.git

REORG: ssl: move openssl-compat from proto to common

This way we can include it much earlier to cover types/ as well.
---

diff --git a/include/proto/openssl-compat.h b/include/common/openssl-compat.h
similarity index 98%
rename from include/proto/openssl-compat.h
rename to include/common/openssl-compat.h
index 1f28b52cba..bc36efcd06 100644
--- a/include/proto/openssl-compat.h
+++ b/include/common/openssl-compat.h
@@ -1,5 +1,5 @@
-#ifndef _PROTO_OPENSSL_COMPAT_H
-#define _PROTO_OPENSSL_COMPAT_H
+#ifndef _COMMON_OPENSSL_COMPAT_H
+#define _COMMON_OPENSSL_COMPAT_H
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
@@ -201,4 +201,4 @@ static inline int EVP_PKEY_base_id(EVP_PKEY *pkey)
 #define TLSEXT_signature_ecdsa      3
 #endif
 
-#endif /* _PROTO_OPENSSL_COMPAT_H */
+#endif /* _COMMON_OPENSSL_COMPAT_H */
diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index 24b7dc772e..3de01e9618 100644
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -26,7 +26,7 @@
 #include <ebmbtree.h>
 
 #include <common/hathreads.h>
-#include <proto/openssl-compat.h>
+#include <common/openssl-compat.h>
 
 struct pkey_info {
 	uint8_t sig;          /* TLSEXT_signature_[rsa,ecdsa,...] */
diff --git a/src/haproxy.c b/src/haproxy.c
index 2dec3f1549..8803e6ea76 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -126,6 +126,7 @@
 #include <proto/dns.h>
 #include <proto/vars.h>
 #ifdef USE_OPENSSL
+#include <common/openssl-compat.h>
 #include <proto/ssl_sock.h>
 #include <openssl/rand.h>
 #endif
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 506be4eb1f..16e12d487f 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -87,6 +87,7 @@
 #include <common/debug.h>
 #include <common/errors.h>
 #include <common/initcall.h>
+#include <common/openssl-compat.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>
@@ -111,7 +112,6 @@
 #include <proto/frontend.h>
 #include <proto/http_rules.h>
 #include <proto/listener.h>
-#include <proto/openssl-compat.h>
 #include <proto/pattern.h>
 #include <proto/proto_tcp.h>
 #include <proto/proto_http.h>