Hello community, here is the log from the commit of package sblim-wbemcli for openSUSE:Factory checked in at 2016-05-17 17:15:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-wbemcli (Old) and /work/SRC/openSUSE:Factory/.sblim-wbemcli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-wbemcli" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-wbemcli/sblim-wbemcli.changes 2014-10-15 18:11:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-wbemcli.new/sblim-wbemcli.changes 2016-05-17 17:15:13.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 12 15:07:14 UTC 2016 - [email protected] + +- Requested by fate#319145 +- Adding: sblim-wbemcli-allow-tls.patch: + * Enable configurable SSL/TLS support + +------------------------------------------------------------------- New: ---- sblim-wbemcli-allow-tls.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-wbemcli.spec ++++++ --- /var/tmp/diff_new_pack.ECoPbl/_old 2016-05-17 17:15:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ECoPbl/_new 2016-05-17 17:15:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sblim-wbemcli # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sblim.wiki.sourceforge.net/ Source: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 +Patch0: sblim-wbemcli-allow-tls.patch Summary: SBLIM WBEM Command Line Interface License: EPL-1.0 Group: System/Management @@ -47,6 +48,7 @@ %prep %setup -q +%patch0 -p1 sed -i 's|wbemcli/samples|wbemcli/examples|' man/wbemcli.1.pre.in sed -i 's|wbemcli/samples|wbemcli/examples|' man/wbemcli.1 ++++++ sblim-wbemcli-allow-tls.patch ++++++ diff -urEbwB sblim-wbemcli-1.6.2/CimCurl.cpp sblim-wbemcli-1.6.2.new/CimCurl.cpp --- sblim-wbemcli-1.6.2/CimCurl.cpp 2009-03-04 20:10:54.000000000 +0100 +++ sblim-wbemcli-1.6.2.new/CimCurl.cpp 2016-05-10 14:53:59.423867376 +0200 @@ -165,8 +165,36 @@ rv = curl_easy_setopt(mHandle, CURLOPT_SSL_VERIFYHOST, 0); // rv = curl_easy_setopt(mHandle, CURLOPT_SSL_VERIFYPEER, 0); - /* Force using SSL V3 */ - rv = curl_easy_setopt(mHandle, CURLOPT_SSLVERSION, 3); + /* Force use of a specific SSL/TLS version */ + char * curlSslVer = getenv("WBEMCLI_CURL_SSLVERSION"); + if (curlSslVer) { + if (!strcasecmp(curlSslVer,"SSLv2")) + rv = curl_easy_setopt(mHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv2); + else if (!strcasecmp(curlSslVer,"SSLv3")) + rv = curl_easy_setopt(mHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3); + else if (!strcasecmp(curlSslVer,"TLSv1")) + rv = curl_easy_setopt(mHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + else if (!strcasecmp(curlSslVer,"TLSv1.0") || !strcasecmp(curlSslVer,"TLSv1_0")) +#if LIBCURL_VERSION_NUM >= 0x072200 + rv = curl_easy_setopt(mHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_0); +#else + throw URLException("WBEMCLI_CURL_SSLVERSION=TLSv1.0 requires libcurl 7.34 or greater"); +#endif + else if (!strcasecmp(curlSslVer,"TLSv1.1") || !strcasecmp(curlSslVer,"TLSv1_1")) +#if LIBCURL_VERSION_NUM >= 0x072200 + rv = curl_easy_setopt(mHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_1); +#else + throw URLException("WBEMCLI_CURL_SSLVERSION=TLSv1.1 requires libcurl 7.34 or greater"); +#endif + else if (!strcasecmp(curlSslVer,"TLSv1.2") || !strcasecmp(curlSslVer,"TLSv1_2")) +#if LIBCURL_VERSION_NUM >= 0x072200 + rv = curl_easy_setopt(mHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2); +#else + throw URLException("WBEMCLI_CURL_SSLVERSION=TLSv1.2 requires libcurl 7.34 or greater"); +#endif + else + throw URLException("unknown WBEMCLI_CURL_SSLVERSION"); + } /* Set username and password */ if (url.user.length() > 0 && url.password.length() > 0) { diff -urEbwB sblim-wbemcli-1.6.2/man/wbemcli.1.pre.in sblim-wbemcli-1.6.2.new/man/wbemcli.1.pre.in --- sblim-wbemcli-1.6.2/man/wbemcli.1.pre.in 2009-06-20 01:10:57.000000000 +0200 +++ sblim-wbemcli-1.6.2.new/man/wbemcli.1.pre.in 2016-05-10 14:56:57.495339650 +0200 @@ -554,6 +554,15 @@ wbemcli gi 'myCimom/root/cimv2:rpm_package.name="glibc"' .PP +.SH ENVIRONMENT +.TP +.B WBEMCLI_CURL_SSLVERSION +Specifies the SSL protocol that will be used. +Valid values are SSLv2, SSLv3, TLSv1, TLSv1.0 (TLSv1_0), TLSv1.1 (TLSv1_1) +or TLSv1.2 (TLSv1_2). +If this variable is not set, wbemcli will attempt to figure out the +remote SSL protocol version. + .SH FILES .TP .I @CACERT@
