From bdce3e3008c4b77f1073d469761911a1e9d5f689 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 21 Feb 2018 11:04:42 +0100 Subject: [PATCH] Fix wrong SSL_CTX_set_cipher_list() retval check --- ...sman-2.6.5-fix-set-cipher-list-retval-check.patch | 12 ++++++++++++ openwsman.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 openwsman-2.6.5-fix-set-cipher-list-retval-check.patch diff --git a/openwsman-2.6.5-fix-set-cipher-list-retval-check.patch b/openwsman-2.6.5-fix-set-cipher-list-retval-check.patch new file mode 100644 index 0000000..dc3e52c --- /dev/null +++ b/openwsman-2.6.5-fix-set-cipher-list-retval-check.patch @@ -0,0 +1,12 @@ +diff -up openwsman-2.6.5/src/server/shttpd/shttpd.c.orig openwsman-2.6.5/src/server/shttpd/shttpd.c +--- openwsman-2.6.5/src/server/shttpd/shttpd.c.orig 2018-02-21 10:53:24.964163710 +0100 ++++ openwsman-2.6.5/src/server/shttpd/shttpd.c 2018-02-21 10:53:31.854162875 +0100 +@@ -1541,7 +1541,7 @@ set_ssl(struct shttpd_ctx *ctx, const ch + + if (ssl_cipher_list) { + int rc = SSL_CTX_set_cipher_list(CTX, ssl_cipher_list); +- if (rc != 0) { ++ if (rc != 1) { + _shttpd_elog(E_LOG, NULL, "Failed to set SSL cipher list \"%s\"", ssl_cipher_list); + } + } diff --git a/openwsman.spec b/openwsman.spec index b46e1b3..d062f11 100644 --- a/openwsman.spec +++ b/openwsman.spec @@ -3,7 +3,7 @@ Name: openwsman Version: 2.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open source Implementation of WS-Management License: BSD @@ -19,6 +19,7 @@ Patch1: openwsman-2.4.0-pamsetup.patch Patch2: openwsman-2.4.12-ruby-binding-build.patch Patch3: openwsman-2.6.2-openssl-1.1-fix.patch Patch4: openwsman-2.6.5-http-status-line.patch +Patch5: openwsman-2.6.5-fix-set-cipher-list-retval-check.patch BuildRequires: swig BuildRequires: libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel BuildRequires: python3 python3-devel ruby ruby-devel rubygems-devel perl-interpreter @@ -279,6 +280,9 @@ rm -f /var/log/wsmand.log %{_bindir}/winrs %changelog +* Wed Feb 21 2018 Vitezslav Crhonek - 2.6.5-3 +- Fix wrong SSL_CTX_set_cipher_list() retval check + * Thu Feb 08 2018 Fedora Release Engineering - 2.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild