mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 04:56:10 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl: remove ifdef around SSL_CTX_get_extra_chain_certs()

Browse Source 
Instead define this one in openssl-compat.h when
SSL_CTRL_GET_EXTRA_CHAIN_CERTS is not defined (which was the current
condition used in the ifdef).
This commit is contained in:
Willy Tarreau 2019-05-11 17:02:04 +02:00
parent 366a6987a7
commit 11b167167e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,5 +292,9 @@ static inline int EVP_PKEY_base_id(EVP_PKEY *pkey)
#define SSL_OP_PRIORITIZE_CHACHA 0
#endif
#ifndef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
#define SSL_CTX_get_extra_chain_certs(ctx, chain) do { *(chain) = (ctx)->extra_certs; } while (0)
#endif
#endif /* USE_OPENSSL */
#endif /* _COMMON_OPENSSL_COMPAT_H */

4
src/ssl_sock.c
View File

@ -1224,11 +1224,7 @@ static int ssl_sock_load_ocsp(SSL_CTX *ctx, const char *cert_path)
goto out;
/* Try to lookup for issuer in certificate extra chain */
#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
SSL_CTX_get_extra_chain_certs(ctx, &chain);
#else
chain = ctx->extra_certs;
#endif
for (i = 0; i < sk_X509_num(chain); i++) {
issuer = sk_X509_value(chain, i);
if (X509_check_issued(issuer, x) == X509_V_OK)