[pywbem] tweaked the ssl_verify_host patch
Michal Minar
miminar at fedoraproject.org
Tue Dec 17 09:22:03 UTC 2013
commit 414b922d8ee37fdf57f8a74a7c8e6b30f6180e67
Author: Michal Minar <miminar at redhat.com>
Date: Tue Dec 17 10:20:53 2013 +0100
tweaked the ssl_verify_host patch
M2Crypto exceptions could propagage to client code which is not desired
because it's an API change. Thery are now catched and turned into pywbem
exceptions.
pywbem-20130723-ssl_verify_host.patch | 2 +-
pywbem.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/pywbem-20130723-ssl_verify_host.patch b/pywbem-20130723-ssl_verify_host.patch
index 621ec2f..20d4218 100644
--- a/pywbem-20130723-ssl_verify_host.patch
+++ b/pywbem-20130723-ssl_verify_host.patch
@@ -70,7 +70,7 @@ Index: pywbem-20131121/cim_http.py
+ try:
+ self.sock = SSL.Connection(ctx)
+ self.sock.connect((self.host, self.port))
-+ except Err.SSLError, arg:
++ except (Err.SSLError, SSL.SSLError, SSL.SSLTimeoutError), arg:
+ raise Error("SSL error: %s" % arg)
+
class FileHTTPConnection(HTTPBaseConnection, httplib.HTTPConnection):
diff --git a/pywbem.spec b/pywbem.spec
index 20a8615..83bffb1 100644
--- a/pywbem.spec
+++ b/pywbem.spec
@@ -4,7 +4,7 @@
Name: pywbem
Version: 0.7.0
-Release: 18.%{revdate}svn%{svnrev}%{?dist}
+Release: 19.%{revdate}svn%{svnrev}%{?dist}
Summary: Python WBEM Client and Provider Interface
Group: Development/Libraries
License: LGPLv2
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%{python_sitelib}/pywbem/twisted_client.py*
%changelog
+* Tue Dec 17 2013 Michal Minar <miminar at redhat.com> 0.7.0-19.20131121svn656
+- Tweaked the ssl_verify_host patch.
+
* Mon Dec 16 2013 Michal Minar <miminar at redhat.com> 0.7.0-18.20131121svn656
- Fixes TOCTOU vulnerability in certificate validation.
- Resolves: rhbz#1026891
More information about the scm-commits
mailing list