From 84c3c393be8946b976ab2fccc32320dbafef241f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Feb 2018 06:28:41 +0100 Subject: v2.8.5 from Fedora --- 0001-enforce-system-crypto-policies.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '0001-enforce-system-crypto-policies.patch') diff --git a/0001-enforce-system-crypto-policies.patch b/0001-enforce-system-crypto-policies.patch index 32a5833..59e1b0c 100644 --- a/0001-enforce-system-crypto-policies.patch +++ b/0001-enforce-system-crypto-policies.patch @@ -1,6 +1,6 @@ -From bc5b9aecd78fe638f50dbe104fc83a67d87c0615 Mon Sep 17 00:00:00 2001 +From e753490615e75d93bd485ca09633e388dd483958 Mon Sep 17 00:00:00 2001 From: Sergey Avseyev -Date: Tue, 26 Sep 2017 19:26:02 +0300 +Date: Fri, 23 Feb 2018 19:02:53 +0300 Subject: [PATCH] Enforce system crypto policies --- @@ -8,10 +8,10 @@ Subject: [PATCH] Enforce system crypto policies 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ssl/ssl_common.c b/src/ssl/ssl_common.c -index b752b5d2..8a615cfd 100644 +index 6ba8579d..ce7c1e0b 100644 --- a/src/ssl/ssl_common.c +++ b/src/ssl/ssl_common.c -@@ -277,8 +277,7 @@ lcbio_ssl_new(const char *cafile, int noverify, lcb_error_t *errp, +@@ -278,8 +278,7 @@ lcbio_pSSLCTX lcbio_ssl_new(const char *tsfile, const char *cafile, const char * goto GT_ERR; } @@ -20,7 +20,7 @@ index b752b5d2..8a615cfd 100644 + SSL_CTX_set_cipher_list(ret->ctx, "PROFILE=SYSTEM"); if (cafile) { - if (!SSL_CTX_load_verify_locations(ret->ctx, cafile, NULL)) { + lcb_log(LOGARGS_S(settings, LCB_LOG_DEBUG), "Load verify locations from \"%s\"", tsfile ? tsfile : keyfile); -- -2.13.5 +2.14.3 -- cgit