RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-16 16:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
These files were already clean as well. Just added ebptnode which is
needed in crtlist_entry.
This commit is contained in:
Willy Tarreau 2020-06-04 14:29:23 +02:00
parent 47d7f9064d
commit 52d88725ab
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/types/ssl_crtlist.h → include/haproxy/ssl_crtlist-t.h
View File

@ -1,5 +1,5 @@
/*
* include/types/ssl_crtlist.h
* include/haproxy/ssl_crtlist-t.h
* crt-list structures
*
* Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
@ -19,11 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_SSL_CRTLIST_H
#define _TYPES_SSL_CRTLIST_H
#ifndef _HAPROXY_SSL_CRTLIST_T_H
#define _HAPROXY_SSL_CRTLIST_T_H
#ifdef USE_OPENSSL
#include <import/ebmbtree.h>
#include <import/ebpttree.h>
#include <haproxy/list-t.h>
@ -61,4 +62,4 @@ struct crtlist_entry {
};
#endif /* USE_OPENSSL */
#endif /* _TYPES_SSL_CRTLIST_H */
#endif /* _HAPROXY_SSL_CRTLIST_T_H */

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

@ -1,5 +1,5 @@
/*
* include/proto/ssl_crtlist.h
* include/haproxy/ssl_crtlist.h
* crt-list function prototyes
*
* Copyright (C) 2020 HAProxy Technologies, William Lallemand <wlallemand@haproxy.com>
@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_SSL_CRTLIST_H
#define _PROTO_SSL_CRTLIST_H
#ifndef _HAPROXY_SSL_CRTLIST_H
#define _HAPROXY_SSL_CRTLIST_H
#ifdef USE_OPENSSL
#include <types/ssl_crtlist.h>
#include <haproxy/ssl_crtlist-t.h>
/* crt-list entry functions */
@ -42,4 +42,4 @@ int crtlist_parse_line(char *line, char **crt_path, struct crtlist_entry *entry,
int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct proxy *curproxy, struct crtlist **crtlist, char **err);
int crtlist_load_cert_dir(char *path, struct bind_conf *bind_conf, struct crtlist **crtlist, 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_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>
#include <haproxy/ssl_crtlist-t.h>
/* ***** READ THIS before adding code here! *****
*

3
src/ssl_crtlist.c
View File

@ -17,6 +17,7 @@
#include <haproxy/errors.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_crtlist.h>
#include <haproxy/tools.h>
#include <dirent.h>
@ -24,13 +25,11 @@
#include <import/ebsttree.h>
#include <types/cli.h>
#include <types/ssl_crtlist.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_sock.h>
/* release ssl bind conf */

2
src/ssl_sock.c
View File

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