- up to 0.9.6, fixes CVE-2021-3634

diff --git a/libssh.spec b/libssh.spec
index 60fca091ec566e9019640b806da6552e44d854e4..f5e9cc826756bb6813586da00558cbcd7bc8f884 100644 (file)
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,13 +1,14 @@
 Summary:       Library implementing the SSH protocol
 Summary(pl.UTF-8):     Biblioteka implementująca protokół SSH
 Name:          libssh
-Version:       0.9.5
+Version:       0.9.6
 Release:       1
 Epoch:         1
 License:       LGPL v2.1+; parts are BSD-licensed
 Group:         Libraries
 Source0:       https://www.libssh.org/files/0.9/%{name}-%{version}.tar.xz
-# Source0-md5: 6211e47ba4dfd7f7e9f8a17a601245f4
+# Source0-md5: 0174df377361221a31a9576afbaba330
+Patch0:                openssl3.patch
 URL:           http://www.libssh.org/
 BuildRequires: cmake >= 3.3.0
 BuildRequires: heimdal-devel
@@ -50,6 +51,7 @@ Pliki nagłówkowe biblioteki libssh.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build

diff --git a/openssl3.patch b/openssl3.patch
new file mode 100644 (file)
index 0000000..b461a9d
--- /dev/null
+++ b/openssl3.patch
@@ -0,0 +1,11 @@
+--- libssh-0.9.6/src/CMakeLists.txt.orig       2021-08-26 14:27:44.000000000 +0200
++++ libssh-0.9.6/src/CMakeLists.txt    2021-09-29 21:52:22.046826365 +0200
+@@ -225,7 +225,7 @@
+             external/sc25519.c
+            )
+     endif (NOT HAVE_OPENSSL_ED25519)
+-    if(OPENSSL_VERSION VERSION_LESS "1.1.0")
++    if((OPENSSL_VERSION AND OPENSSL_VERSION VERSION_LESS "1.1.0") OR (_OPENSSL_VERSION AND _OPENSSL_VERSION VERSION_LESS "1.1.0"))
+         set(libssh_SRCS ${libssh_SRCS} libcrypto-compat.c)
+     endif()
+ endif (WITH_GCRYPT)