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/socket.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/socket.py')
| -rw-r--r-- | Lib/socket.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/socket.py b/Lib/socket.py index 313151c505..30be5c5324 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -56,13 +56,13 @@ else: # we do an internal import here because the ssl # module imports the socket module import ssl as _realssl - warnings.warn("socket.ssl() is deprecated. Use ssl.sslsocket() instead.", + warnings.warn("socket.ssl() is deprecated. Use ssl.wrap_socket() instead.", DeprecationWarning, stacklevel=2) return _realssl.sslwrap_simple(sock, keyfile, certfile) # we need to import the same constants we used to... + from _ssl import SSLError as sslerror from _ssl import \ - sslerror, \ RAND_add, \ RAND_egd, \ RAND_status, \ |