From 9b9289d475461e12a06155d58b538956a5a97528 Mon Sep 17 00:00:00 2001 From: Emmanuel Hocdet Date: Mon, 3 Dec 2018 18:07:44 +0100 Subject: [PATCH 3/8] MINOR: ssl: add extra chain compatibility cert_key_and_chain handling is now outside openssl 1.0.2 #if: the code must be libssl compatible. SSL_CTX_set1_chain requires openssl >= 1.0.2, replace it by legacy SSL_CTX_add_extra_chain_cert when SSL_CTX_set1_chain is not provided. --- src/ssl_sock.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index fd74c753..b6d88d84 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -2965,11 +2965,24 @@ static int ssl_sock_put_ckch_into_ctx(const char *path, const struct cert_key_an } /* Load all certs in the ckch into the ctx_chain for the ssl_ctx */ +#ifdef SSL_CTX_set1_chain if (!SSL_CTX_set1_chain(ctx, ckch->chain)) { memprintf(err, "%sunable to load chain certificate into SSL Context '%s'. Make sure you are linking against Openssl >= 1.0.2.\n", err && *err ? *err : "", path); return 1; } +#else + { /* legacy compat (< openssl 1.0.2) */ + X509 *ca; + while ((ca = sk_X509_shift(ckch->chain))) + if (!SSL_CTX_add_extra_chain_cert(ctx, ca)) { + memprintf(err, "%sunable to load chain certificate into SSL Context '%s'.\n", + err && *err ? *err : "", path); + X509_free(ca); + return 1; + } + } +#endif if (SSL_CTX_check_private_key(ctx) <= 0) { memprintf(err, "%sinconsistencies between private key and certificate loaded from PEM file '%s'.\n", -- 2.11.0