copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Switch back to TLSv1 method 

- Remove debug prints in stdlib ssl compatibility code
This commit is contained in:
junglecow 2006-12-21 18:08:17 +00:00
parent 62350adb36
commit 35ecad1188
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/xmpp/transports_nb.py
View File

@ -217,7 +217,7 @@ class StdlibSSLWrapper(SSLWrapper):
try: try:
return self.sslobj.read(bufsize) return self.sslobj.read(bufsize)
except socket.sslerror, e: except socket.sslerror, e:
log.debug("Recv: Caught socket.sslerror:", exc_info=True) #log.debug("Recv: Caught socket.sslerror:", exc_info=True)
#traceback.print_exc() #traceback.print_exc()
if e.args[0] not in (socket.SSL_ERROR_WANT_READ, socket.SSL_ERROR_WANT_WRITE): if e.args[0] not in (socket.SSL_ERROR_WANT_READ, socket.SSL_ERROR_WANT_WRITE):
raise SSLWrapper.Error(self.sock or self.sslobj, e) raise SSLWrapper.Error(self.sock or self.sslobj, e)
@ -228,7 +228,7 @@ class StdlibSSLWrapper(SSLWrapper):
try: try:
return self.sslobj.write(data) return self.sslobj.write(data)
except socket.sslerror, e: except socket.sslerror, e:
log.debug("Send: Caught socket.sslerror:", exc_info=True) #log.debug("Send: Caught socket.sslerror:", exc_info=True)
#traceback.print_exc() #traceback.print_exc()
if e.args[0] not in (socket.SSL_ERROR_WANT_READ, socket.SSL_ERROR_WANT_WRITE): if e.args[0] not in (socket.SSL_ERROR_WANT_READ, socket.SSL_ERROR_WANT_WRITE):
raise SSLWrapper.Error(self.sock or self.sslobj, e) raise SSLWrapper.Error(self.sock or self.sslobj, e)
@ -710,8 +710,8 @@ class NonBlockingTLS(PlugIn):
log.debug("_startSSL_pyOpenSSL called") log.debug("_startSSL_pyOpenSSL called")
tcpsock = self._owner.Connection tcpsock = self._owner.Connection
# FIXME: should method be configurable? # FIXME: should method be configurable?
#tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) #tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
tcpsock._sslContext.set_info_callback(self._ssl_info_callback) tcpsock._sslContext.set_info_callback(self._ssl_info_callback)
tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext, tcpsock._sock) tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext, tcpsock._sock)
tcpsock._sslObj.set_connect_state() # set to client mode tcpsock._sslObj.set_connect_state() # set to client mode