summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2020-05-31 14:32:56 +0200
committerGitHub <noreply@github.com>2020-05-31 14:32:56 +0200
commitf644b112addb6898063480e44491da94cf2e2ecc (patch)
tree1af9d99a593951e7d178be1d32dd691a2c70230f
parentbdd541174736522c92ff786576e744269c3a1c2c (diff)
parent151b12a80fe60e671604433876af4fd2a1f7084d (diff)
downloadredis-f644b112addb6898063480e44491da94cf2e2ecc.tar.gz
Merge pull request #7334 from kevin-fwu/tls_load_chained_certs
Fix TLS certificate loading for chained certificates.
-rw-r--r--src/tls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tls.c b/src/tls.c
index 28a74df9a..a62f2284e 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -217,7 +217,7 @@ int tlsConfigure(redisTLSContextConfig *ctx_config) {
SSL_CTX_set_ecdh_auto(ctx, 1);
#endif
- if (SSL_CTX_use_certificate_file(ctx, ctx_config->cert_file, SSL_FILETYPE_PEM) <= 0) {
+ if (SSL_CTX_use_certificate_chain_file(ctx, ctx_config->cert_file) <= 0) {
ERR_error_string_n(ERR_get_error(), errbuf, sizeof(errbuf));
serverLog(LL_WARNING, "Failed to load certificate: %s: %s", ctx_config->cert_file, errbuf);
goto error;