rpms/m2crypto/devel m2crypto-0.15-Connection.patch, NONE, 1.1 m2crypto.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15840

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.15-Connection.patch 
Log Message:
* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-4
- Fix SSL.Connection.accept (#188742)


m2crypto-0.15-Connection.patch:
 Connection.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE m2crypto-0.15-Connection.patch ---
--- m2crypto-0.15/M2Crypto/SSL/Connection.py.Connection	2006-04-19 17:55:18.000000000 +0200
+++ m2crypto-0.15/M2Crypto/SSL/Connection.py	2006-04-19 17:55:31.000000000 +0200
@@ -17,7 +17,7 @@
 #SSLError = getattr(__import__('M2Crypto.SSL', globals(), locals(), 'SSLError'), 'SSLError')
 from M2Crypto.SSL import SSLError
 
-def _serverPostConnectionCheck(peerX509, expectedHost):
+def _serverPostConnectionCheck(*args, **kw):
     return 1
 
 class Connection:
@@ -111,9 +111,9 @@
         ssl.setup_ssl()
         ssl.set_accept_state()
         ssl.accept_ssl()
-        check = getattr(self, 'postConnectionCheck', Connection.serverPostConnectionCheck)
+        check = getattr(self, 'postConnectionCheck', self.serverPostConnectionCheck)
         if check is not None:
-            if not check(self.get_peer_cert(), self.addr[0]):
+            if not check(self.get_peer_cert(), ssl.addr[0]):
                 raise Checker.SSLVerificationError, 'post connection check failed'
         return ssl, addr
 
@@ -129,7 +129,7 @@
         self.setup_ssl()
         self.set_connect_state()
         ret = self.connect_ssl()
-        check = getattr(self, 'postConnectionCheck', Connection.clientPostConnectionCheck)
+        check = getattr(self, 'postConnectionCheck', self.clientPostConnectionCheck)
         if check is not None:
             if not check(self.get_peer_cert(), self.addr[0]):
                 raise Checker.SSLVerificationError, 'post connection check failed'


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- m2crypto.spec	11 Feb 2006 04:26:54 -0000	1.20
+++ m2crypto.spec	19 Apr 2006 16:05:25 -0000	1.21
@@ -3,10 +3,11 @@
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.15
-Release: 3.2
+Release: 4
 # http://svn.osafoundation.org/m2crypto/tags/0.15
 Source0: m2crypto-%{version}.tar.bz2
 Patch0: m2crypto-0.13-SSLServer.patch
+Patch1: m2crypto-0.15-Connection.patch
 License: BSDish
 Group: System Environment/Libraries
 URL: http://sandbox.rulemaker.net/ngps/m2
@@ -22,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .SSLServer
+%patch1 -p1 -b .Connection
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
@@ -52,6 +54,9 @@
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-4
+- Fix SSL.Connection.accept (#188742)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.15-3.2
 - bump again for double-long bug on ppc(64)