diff options
| author | Bill Janssen <janssen@parc.com> | 2007-09-10 21:51:02 +0000 |
|---|---|---|
| committer | Bill Janssen <janssen@parc.com> | 2007-09-10 21:51:02 +0000 |
| commit | 98d19dafd9c9d95338887b9e53c77ec6960918e0 (patch) | |
| tree | 1a21af6b4c5c2ba186ff8395663bc751fced6a94 /Lib/imaplib.py | |
| parent | a0c05512ec071b98e8170c8cfe845bee6fc934da (diff) | |
| download | cpython-git-98d19dafd9c9d95338887b9e53c77ec6960918e0.tar.gz | |
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/imaplib.py')
| -rw-r--r-- | Lib/imaplib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 5a7adf4c80..c05abb470a 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -1147,7 +1147,7 @@ else: self.port = port self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock.connect((host, port)) - self.sslobj = ssl.sslsocket(self.sock, self.keyfile, self.certfile) + self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile) def read(self, size): @@ -1199,7 +1199,7 @@ else: def ssl(self): """Return SSLObject instance used to communicate with the IMAP4 server. - ssl = ssl.sslsocket(<instance>.socket) + ssl = ssl.wrap_socket(<instance>.socket) """ return self.sslobj |