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 1f28b52cb..bc36efcd0 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 #include #include @@ -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 24b7dc772..3de01e961 100644 --- a/include/types/ssl_sock.h +++ b/include/types/ssl_sock.h @@ -26,7 +26,7 @@ #include #include -#include +#include struct pkey_info { uint8_t sig; /* TLSEXT_signature_[rsa,ecdsa,...] */ diff --git a/src/haproxy.c b/src/haproxy.c index 2dec3f154..8803e6ea7 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -126,6 +126,7 @@ #include #include #ifdef USE_OPENSSL +#include #include #include #endif diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 506be4eb1..16e12d487 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -87,6 +87,7 @@ #include #include #include +#include #include #include #include @@ -111,7 +112,6 @@ #include #include #include -#include #include #include #include