gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2020-05-27 16:26:00 +02:00
parent 8d36697dee
commit 6019faba50
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/openssl-compat.h → include/haproxy/openssl-compat.h
View File

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

2
include/proto/ssl_sock.h
View File

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

2
include/types/listener.h
View File

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

2
include/types/server.h
View File

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

2
include/types/ssl_ckch.h
View File

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

2
include/types/ssl_sock.h
View File

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

2
src/cfgparse-ssl.c
View File

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

2
src/haproxy.c
View File

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

2
src/ssl_sample.c
View File

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

2
src/ssl_sock.c
View File

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

2
src/ssl_utils.c
View File

@ -13,7 +13,7 @@
#include <common/buffer.h>
#include <common/openssl-compat.h>
#include <haproxy/openssl-compat.h>
#include <proto/ssl_sock.h>