summaryrefslogtreecommitdiffstats
path: root/Lib/poplib.py
diff options
context:
space:
mode:
authorBill Janssen <janssen@parc.com>2007-09-10 21:51:02 (GMT)
committerBill Janssen <janssen@parc.com>2007-09-10 21:51:02 (GMT)
commit98d19dafd9c9d95338887b9e53c77ec6960918e0 (patch)
tree1a21af6b4c5c2ba186ff8395663bc751fced6a94 /Lib/poplib.py
parenta0c05512ec071b98e8170c8cfe845bee6fc934da (diff)
downloadcpython-98d19dafd9c9d95338887b9e53c77ec6960918e0.zip
cpython-98d19dafd9c9d95338887b9e53c77ec6960918e0.tar.gz
cpython-98d19dafd9c9d95338887b9e53c77ec6960918e0.tar.bz2
More work on SSL support.
* Much expanded test suite: All protocols tested against all other protocols. All protocols tested with all certificate options. Tests for bad key and bad cert. Test of STARTTLS functionality. Test of RAND_* functions. * Fixes for threading/malloc bug. * Issue 1065 fixed: sslsocket class renamed to SSLSocket. sslerror class renamed to SSLError. Function "wrap_socket" now used to wrap an existing socket. * Issue 1583946 finally fixed: Support for subjectAltName added. Subject name now returned as proper DN list of RDNs. * SSLError exported from socket as "sslerror". * RAND_* functions properly exported from ssl.py. * Documentation improved: Example of how to create a self-signed certificate. Better indexing.
Diffstat (limited to 'Lib/poplib.py')
-rw-r--r--Lib/poplib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/poplib.py b/Lib/poplib.py
index c421529..149675a 100644
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -348,7 +348,7 @@ else:
if not self.sock:
raise socket.error, msg
self.file = self.sock.makefile('rb')
- self.sslobj = ssl.sslsocket(self.sock, self.keyfile, self.certfile)
+ self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)
self._debugging = 0
self.welcome = self._getresp()