summarylogtreecommitdiffstats
path: root/fix-openssl11.patch
diff options
context:
space:
mode:
authorToke Høiland-Jørgensen2017-05-05 11:56:06 +0200
committerToke Høiland-Jørgensen2017-05-05 15:54:42 +0200
commitbaa961032a0092d5ae195250dd6bfe2c711b104c (patch)
tree6b732c94c90f9a1e5c8f82e0073df394515f19fc /fix-openssl11.patch
downloadaur-baa961032a0092d5ae195250dd6bfe2c711b104c.tar.gz
Initial import
Diffstat (limited to 'fix-openssl11.patch')
-rw-r--r--fix-openssl11.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/fix-openssl11.patch b/fix-openssl11.patch
new file mode 100644
index 000000000000..ac76677a5e1e
--- /dev/null
+++ b/fix-openssl11.patch
@@ -0,0 +1,27 @@
+--- a/cpp/src/rpc/client.cpp 2015-03-12 13:43:08.000000000 +0100
++++ b/cpp/src/rpc/client.cpp 2017-05-05 11:51:09.300379804 +0200
+@@ -357,19 +357,20 @@
+ }
+
+ bool override = false;
+- if (sctx->error != 0) {
++ int err = X509_STORE_CTX_get_error(sctx);
++ if (err != 0) {
+ if (Logging::log->loggingActive(LEVEL_DEBUG)) {
+ Logging::log->getLog(LEVEL_DEBUG) << "OpenSSL verify error: "
+- << sctx->error << endl;
++ << err << endl;
+ }
+
+ // Ignore error if verification is turned off in general or the error has
+ // been disabled specifically.
+ if (!ssl_options->verify_certificates() ||
+- ssl_options->ignore_verify_error(sctx->error)) {
++ ssl_options->ignore_verify_error(err)) {
+ if (Logging::log->loggingActive(LEVEL_WARN)) {
+ Logging::log->getLog(LEVEL_WARN) << "Ignoring OpenSSL verify error: "
+- << sctx->error << " because of user settings." << endl;
++ << err << " because of user settings." << endl;
+ }
+ override = true;
+ }