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

This way we can include it much earlier to cover types/ as well.
This commit is contained in:
Willy Tarreau 2019-05-09 14:52:44 +02:00
parent df17e0e1a7
commit 5599456ee2
4 changed files with 6 additions and 5 deletions

View File

@ -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 */

View File

@ -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,...] */

View File

@ -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

View File

@ -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>