RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-22 10:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: include: move ssl_utils.h to haproxy/ssl_utils.h

Browse Source 
Just added buf-t and openssl-compat for the missing types that appear
in the prototypes.
This commit is contained in:
Willy Tarreau 2020-06-04 14:21:22 +02:00
parent b5abe5bd5d
commit b2bd865804
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/proto/ssl_utils.h → include/haproxy/ssl_utils.h
View File

@ -1,5 +1,5 @@
/*
* include/proto/ssl_utils.h
* include/haproxy/ssl_utils.h
*
* Utility functions for SSL:
* Mostly generic functions that retrieve information from certificates
@ -22,10 +22,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_SSL_UTILS_H
#define _TYPES_SSL_UTILS_H
#ifndef _HAPROXY_SSL_UTILS_H
#define _HAPROXY_SSL_UTILS_H
#ifdef USE_OPENSSL
#include <haproxy/buf-t.h>
#include <haproxy/openssl-compat.h>
int cert_get_pkey_algo(X509 *crt, struct buffer *out);
int ssl_sock_get_serial(X509 *crt, struct buffer *out);
int ssl_sock_crt2der(X509 *crt, struct buffer *out);
@ -35,6 +39,6 @@ int ssl_sock_get_dn_entry(X509_NAME *a, const struct buffer *entry, int pos,
int ssl_sock_get_dn_formatted(X509_NAME *a, const struct buffer *format, struct buffer *out);
int ssl_sock_get_dn_oneline(X509_NAME *a, struct buffer *out);
#endif /* _TYPES_SSL_UTILS_H */
#endif /* _HAPROXY_SSL_UTILS_H */
#endif /* USE_OPENSSL */

2
src/ssl_ckch.c
View File

@ -23,6 +23,7 @@
#include <haproxy/base64.h>
#include <haproxy/errors.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
#include <import/ebsttree.h>
@ -35,7 +36,6 @@
#include <proto/channel.h>
#include <proto/ssl_ckch.h>
#include <proto/ssl_sock.h>
#include <proto/ssl_utils.h>
#include <proto/stream_interface.h>
/* Uncommitted CKCH transaction */

2
src/ssl_sample.c
View File

@ -24,6 +24,7 @@
#include <haproxy/buf-t.h>
#include <haproxy/obj_type.h>
#include <haproxy/openssl-compat.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
#include <types/sample.h>
@ -32,7 +33,6 @@
#include <proto/acl.h>
#include <haproxy/arg.h>
#include <proto/ssl_sock.h>
#include <proto/ssl_utils.h>
#include <proto/sample.h>

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_utils.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
@ -83,7 +84,6 @@
#include <proto/ssl_ckch.h>
#include <proto/ssl_crtlist.h>
#include <proto/ssl_sock.h>
#include <proto/ssl_utils.h>
#include <proto/stream.h>
#include <proto/task.h>
#include <proto/vars.h>