mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-29 14:01:50 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl: never include openssl/*.h outside of openssl-compat.h anymore

Browse Source 
Since we're providing a compatibility layer for multiple OpenSSL
implementations and their derivatives, it is important that no C file
directly includes openssl headers but only passes via openssl-compat
instead. As a bonus this also gets rid of redundant complex rules for
inclusion of certain files (engines etc).
This commit is contained in:
Willy Tarreau 2019-05-10 09:35:00 +02:00
parent 9356dacd22
commit 8d164dc568
7 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/common/openssl-compat.h
View File

@ -1,18 +1,27 @@
#ifndef _COMMON_OPENSSL_COMPAT_H
#define _COMMON_OPENSSL_COMPAT_H
#include <openssl/bn.h>
#include <openssl/crypto.h>
#include <openssl/ssl.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/x509.h>
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/hmac.h>
#if (defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB && !defined OPENSSL_NO_OCSP)
#include <openssl/ocsp.h>
#endif
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#endif
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(OPENSSL_NO_ASYNC) && !defined(LIBRESSL_VERSION_NUMBER)
#include <openssl/async.h>
#endif
#if defined(LIBRESSL_VERSION_NUMBER)
/* LibreSSL is a fork of OpenSSL 1.0.1g but pretends to be 2.0.0, thus

2
include/proto/ssl_sock.h
View File

@ -21,7 +21,7 @@
#ifndef _PROTO_SSL_SOCK_H
#define _PROTO_SSL_SOCK_H
#include <openssl/ssl.h>
#include <common/openssl-compat.h>
#include <types/connection.h>
#include <types/listener.h>

2
include/types/listener.h
View File

@ -26,7 +26,7 @@
#include <sys/socket.h>
#ifdef USE_OPENSSL
#include <openssl/ssl.h>
#include <common/openssl-compat.h>
#include <types/ssl_sock.h>
#endif

2
include/types/server.h
View File

@ -26,7 +26,7 @@
#include <arpa/inet.h>
#ifdef USE_OPENSSL
#include <openssl/ssl.h>
#include <common/openssl-compat.h>
#include <types/ssl_sock.h>
#endif

1
include/types/ssl_sock.h
View File

@ -22,7 +22,6 @@
#ifndef _TYPES_SSL_SOCK_H
#define _TYPES_SSL_SOCK_H
#include <openssl/ssl.h>
#include <ebmbtree.h>
#include <common/hathreads.h>

1
src/haproxy.c
View File

@ -128,7 +128,6 @@
#ifdef USE_OPENSSL
#include <common/openssl-compat.h>
#include <proto/ssl_sock.h>
#include <openssl/rand.h>
#endif
/* array of init calls for older platforms */

23
src/ssl_sock.c
View File

@ -23,6 +23,7 @@
*
*/
/* Note: do NOT include openssl/xxx.h here, do it in openssl-compat.h */
#define _GNU_SOURCE
#include <ctype.h>
#include <dirent.h>
@ -39,28 +40,6 @@
#include <netdb.h>
#include <netinet/tcp.h>
#include <openssl/bn.h>
#include <openssl/crypto.h>
#include <openssl/ssl.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/hmac.h>
#if (defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB && !defined OPENSSL_NO_OCSP)
#include <openssl/ocsp.h>
#endif
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#endif
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(OPENSSL_NO_ASYNC) && !defined(LIBRESSL_VERSION_NUMBER)
#include <openssl/async.h>
#endif
#include <import/lru.h>
#include <import/xxhash.h>