mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl: rename ssl_get_issuer_chain to ssl_get0_issuer_chain

Browse Source 
Rename ssl_get_issuer_chain to ssl_get0_issuer_chain to be consistent
with openssl >= 1.0.2 API.
This commit is contained in:
Emmanuel Hocdet 2020-03-23 11:29:11 +01:00 committed by William Lallemand
parent f4f14eacd3
commit ef87e0a3da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl_sock.c
View File

@ -161,7 +161,7 @@ static struct xprt_ops ssl_sock;
int nb_engines = 0; int nb_engines = 0;
static struct eb_root cert_issuer_tree = EB_ROOT; /* issuers tree from "issuers-chain-path" */ static struct eb_root cert_issuer_tree = EB_ROOT; /* issuers tree from "issuers-chain-path" */
static struct issuer_chain* ssl_get_issuer_chain(X509 *cert); static struct issuer_chain* ssl_get0_issuer_chain(X509 *cert);
static struct { static struct {
char *crt_base; /* base directory path for certificates */ char *crt_base; /* base directory path for certificates */
@ -3629,7 +3629,7 @@ static int ssl_sock_put_ckch_into_ctx(const char *path, const struct cert_key_an
} else { } else {
/* Find Certificate Chain in global */ /* Find Certificate Chain in global */
struct issuer_chain *issuer; struct issuer_chain *issuer;
issuer = ssl_get_issuer_chain(ckch->cert); issuer = ssl_get0_issuer_chain(ckch->cert);
if (issuer) if (issuer)
find_chain = issuer->chain; find_chain = issuer->chain;
} }
@ -10166,7 +10166,7 @@ static int ssl_load_global_issuer_from_BIO(BIO *in, char *fp, char **err)
return ret; return ret;
} }
static struct issuer_chain* ssl_get_issuer_chain(X509 *cert) static struct issuer_chain* ssl_get0_issuer_chain(X509 *cert)
{ {
AUTHORITY_KEYID *akid; AUTHORITY_KEYID *akid;
struct issuer_chain *issuer = NULL; struct issuer_chain *issuer = NULL;
@ -11268,7 +11268,7 @@ static int cli_io_handler_show_cert_detail(struct appctx *appctx)
chain = ckchs->ckch->chain; chain = ckchs->ckch->chain;
if (chain == NULL) { if (chain == NULL) {
struct issuer_chain *issuer; struct issuer_chain *issuer;
issuer = ssl_get_issuer_chain(ckchs->ckch->cert); issuer = ssl_get0_issuer_chain(ckchs->ckch->cert);
if (issuer) { if (issuer) {
chain = issuer->chain; chain = issuer->chain;
chunk_appendf(out, "Chain Filename: "); chunk_appendf(out, "Chain Filename: ");