RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-29 09:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: include: move ssl_ckch.h to haproxy/ssl_ckch{,-t}.h

Browse Source 
buf-t and ebmbtree were included.
This commit is contained in:
Willy Tarreau 2020-06-04 14:25:47 +02:00
parent b2bd865804
commit 47d7f9064d
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/types/ssl_ckch.h → include/haproxy/ssl_ckch-t.h
View File

@ -1,5 +1,5 @@
/*
* include/types/ssl_ckch.h
* include/haproxy/ssl_ckch-t.h
* ckch structures
*
* Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
@ -29,10 +29,12 @@
*/
#ifndef _TYPES_SSL_CKCH_H
#define _TYPES_SSL_CKCH_H
#ifndef _HAPROXY_SSL_CKCH_T_H
#define _HAPROXY_SSL_CKCH_T_H
#ifdef USE_OPENSSL
#include <import/ebmbtree.h>
#include <haproxy/buf-t.h>
#include <haproxy/list-t.h>
#include <haproxy/openssl-compat.h>
@ -93,4 +95,4 @@ struct ckch_inst {
};
#endif /* USE_OPENSSL */
#endif /* _TYPES_SSL_CKCH_H */
#endif /* _HAPROXY_SSL_CKCH_T_H */

10
include/proto/ssl_ckch.h → include/haproxy/ssl_ckch.h
View File

@ -1,5 +1,5 @@
/*
* include/proto/ssl_ckch.h
* include/haproxy/ssl_ckch.h
* ckch function prototypes
*
* Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
@ -19,10 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_SSL_CKCH_H
#define _PROTO_SSL_CKCH_H
#ifndef _HAPROXY_SSL_CKCH_H
#define _HAPROXY_SSL_CKCH_H
#ifdef USE_OPENSSL
#include <haproxy/ssl_ckch-t.h>
/* cert_key_and_chain functions */
int ssl_sock_load_files_into_ckch(const char *path, struct cert_key_and_chain *ckch, char **err);
@ -60,4 +62,4 @@ int ckch_inst_new_load_store(const char *path, struct ckch_store *ckchs, struct
struct ssl_bind_conf *ssl_conf, char **sni_filter, int fcount, struct ckch_inst **ckchi, char **err);
#endif /* USE_OPENSSL */
#endif /* _PROTO_SSL_CRTLIST_H */
#endif /* _HAPROXY_SSL_CRTLIST_H */

2
include/types/ssl_sock.h
View File

@ -28,13 +28,13 @@
#include <import/eb64tree.h>
#include <types/connection.h> /* struct wait_event */
#include <types/ssl_ckch.h>
#include <types/ssl_crtlist.h>
#include <haproxy/buf-t.h>
#include <haproxy/thread.h>
#include <haproxy/list-t.h>
#include <haproxy/openssl-compat.h>
#include <haproxy/ssl_ckch-t.h>
/* ***** READ THIS before adding code here! *****
*

3
src/ssl_ckch.c
View File

@ -23,18 +23,17 @@
#include <haproxy/base64.h>
#include <haproxy/errors.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
#include <import/ebsttree.h>
#include <types/cli.h>
#include <types/ssl_ckch.h>
#include <types/ssl_sock.h>
#include <proto/cli.h>
#include <proto/channel.h>
#include <proto/ssl_ckch.h>
#include <proto/ssl_sock.h>
#include <proto/stream_interface.h>

3
src/ssl_crtlist.c
View File

@ -16,6 +16,7 @@
#include <sys/types.h>
#include <haproxy/errors.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/tools.h>
#include <dirent.h>
@ -24,14 +25,12 @@
#include <types/cli.h>
#include <types/ssl_crtlist.h>
#include <types/ssl_ckch.h>
#include <types/ssl_sock.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <proto/stream_interface.h>
#include <proto/ssl_crtlist.h>
#include <proto/ssl_ckch.h>
#include <proto/ssl_sock.h>
/* release ssl bind conf */

2
src/ssl_sock.c
View File

@ -51,6 +51,7 @@
#include <haproxy/http_rules.h>
#include <haproxy/openssl-compat.h>
#include <haproxy/shctx.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
@ -81,7 +82,6 @@
#include <proto/stream_interface.h>
#include <proto/log.h>
#include <proto/proxy.h>
#include <proto/ssl_ckch.h>
#include <proto/ssl_crtlist.h>
#include <proto/ssl_sock.h>
#include <proto/stream.h>