Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py 2--- xmpppy-0.5.0rc1/xmpp/transports.py 2009-04-07 12:34:09.000000000 +0400 3+++ xmpppy-0.5.0rc1.q/xmpp/transports.py 2015-05-08 13:06:03.049252065 +0300 4@@ -27,7 +27,7 @@ 5 Also exception 'error' is defined to allow capture of this module specific exceptions. 6 """ 7 8-import socket,select,base64,dispatcher,sys 9+import socket,ssl,select,base64,dispatcher,sys 10 from simplexml import ustr 11 from client import PlugIn 12 from protocol import * 13@@ -312,9 +312,9 @@ 14 """ Immidiatedly switch socket to TLS mode. Used internally.""" 15 """ Here we should switch pending_data to hint mode.""" 16 tcpsock=self._owner.Connection 17- tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None) 18- tcpsock._sslIssuer = tcpsock._sslObj.issuer() 19- tcpsock._sslServer = tcpsock._sslObj.server() 20+ tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, None, None) 21+ tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer') 22+ tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server') 23 tcpsock._recv = tcpsock._sslObj.read 24 tcpsock._send = tcpsock._sslObj.write 25