[libreoffice-online] 01/01: restore fix-sigsegv-with-libssl1.1.diff; fix happened after branchoff

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository libreoffice-online.

commit 7ad18eccc45f9eab577fbb19fb8857e6bcb28361
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 28 01:14:07 2017 +0100

    restore fix-sigsegv-with-libssl1.1.diff; fix happened after branchoff
---
 debian/patches/fix-sigsegv-with-libssl1.1.diff | 31 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/fix-sigsegv-with-libssl1.1.diff b/debian/patches/fix-sigsegv-with-libssl1.1.diff
new file mode 100644
index 0000000..a91e1fc
--- /dev/null
+++ b/debian/patches/fix-sigsegv-with-libssl1.1.diff
@@ -0,0 +1,31 @@
+From 483a5d68e5f7e6b145d957c50120cd05c436387b Mon Sep 17 00:00:00 2001
+From: Pranav Kant <pranavk at collabora.co.uk>
+Date: Mon, 27 Nov 2017 16:29:26 +0530
+Subject: tdf#114073: Potential fix for crash with openssl1.1
+
+Using null ssl context to set options is surely not a good idea:
+
+unsigned long SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op)
+{
+    return ctx->options |= op;
+}
+
+Change-Id: I2700350e0c3928e372488c81b8111c9ab0b48e06
+
+diff --git a/net/Ssl.cpp b/net/Ssl.cpp
+index dd0094b..a16caa2 100644
+--- a/net/Ssl.cpp
++++ b/net/Ssl.cpp
+@@ -50,8 +50,7 @@ SslContext::SslContext(const std::string& certFilePath,
+ #endif
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10100003L
+-    SSL_CTX_set_options(nullptr, 0);
+-    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
++    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, nullptr);
+ #else
+     SSL_library_init();
+     SSL_load_error_strings();
+-- 
+cgit v0.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index f774f8c..2a37b39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ lo-path.diff
 etc-default.diff
 ssl-dir.diff
 logs.diff
+fix-sigsegv-with-libssl1.1.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git