traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove duplicate close() from ssl.py; expose unwrap and add test for it

This commit is contained in:
Bill Janssen 2008-08-12 16:31:21 +00:00
parent f91d46a17d
commit 39295c2650
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/ssl.py
View File

@ -234,14 +234,18 @@ class SSLSocket (socket):
else: else:
return 0 return 0
def unwrap (self):
if self._sslobj:
s = self._sslobj.shutdown()
self._sslobj = None
return s
else:
raise ValueError("No SSL wrapper around " + str(self))
def shutdown (self, how): def shutdown (self, how):
self._sslobj = None self._sslobj = None
socket.shutdown(self, how) socket.shutdown(self, how)
def close (self):
self._sslobj = None
socket.close(self)
def close (self): def close (self):
if self._makefile_refs < 1: if self._makefile_refs < 1:
self._sslobj = None self._sslobj = None

19
Lib/test/test_ssl.py
View File

@ -282,6 +282,14 @@ else:
self.write("OK\n") self.write("OK\n")
if not self.wrap_conn(): if not self.wrap_conn():
return return
elif self.server.starttls_server and self.sslconn and msg.strip() == 'ENDTLS':
if test_support.verbose and self.server.connectionchatty:
sys.stdout.write(" server: read ENDTLS from client, sending OK...\n")
self.write("OK\n")
self.sslconn.unwrap()
self.sslconn = None
if test_support.verbose and self.server.connectionchatty:
sys.stdout.write(" server: connection is now unencrypted...\n")
else: else:
if (test_support.verbose and if (test_support.verbose and
self.server.connectionchatty): self.server.connectionchatty):
@ -867,7 +875,7 @@ else:
def testSTARTTLS (self): def testSTARTTLS (self):
msgs = ("msg 1", "MSG 2", "STARTTLS", "MSG 3", "msg 4") msgs = ("msg 1", "MSG 2", "STARTTLS", "MSG 3", "msg 4", "ENDTLS", "msg 5", "msg 6")
server = ThreadedEchoServer(CERTFILE, server = ThreadedEchoServer(CERTFILE,
ssl_version=ssl.PROTOCOL_TLSv1, ssl_version=ssl.PROTOCOL_TLSv1,
@ -907,8 +915,15 @@ else:
" client: read %s from server, starting TLS...\n" " client: read %s from server, starting TLS...\n"
% repr(outdata)) % repr(outdata))
conn = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1) conn = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1)
wrapped = True wrapped = True
elif (indata == "ENDTLS" and
outdata.strip().lower().startswith("ok")):
if test_support.verbose:
sys.stdout.write(
" client: read %s from server, ending TLS...\n"
% repr(outdata))
s = conn.unwrap()
wrapped = False
else: else:
if test_support.verbose: if test_support.verbose:
sys.stdout.write( sys.stdout.write(