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.
This commit is contained in:
Michal Minar 2013-12-17 10:20:53 +01:00
parent b00fe8f781
commit 414b922d8e
2 changed files with 5 additions and 2 deletions

View File

@ -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):

View File

@ -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@redhat.com> 0.7.0-19.20131121svn656
- Tweaked the ssl_verify_host patch.
* Mon Dec 16 2013 Michal Minar <miminar@redhat.com> 0.7.0-18.20131121svn656
- Fixes TOCTOU vulnerability in certificate validation.
- Resolves: rhbz#1026891