From 40a0f66e95e18bd7a76829ca312fce690d0c0747 Mon Sep 17 00:00:00 2001 From: Bill Janssen Date: Tue, 12 Aug 2008 16:56:25 +0000 Subject: clean up ssl.py; expose unwrap and add test for it --- Lib/ssl.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Lib/ssl.py') diff --git a/Lib/ssl.py b/Lib/ssl.py index c072cd960b..aa301295ae 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -75,10 +75,10 @@ from _ssl import ( SSL_ERROR_INVALID_ERROR_CODE, ) -from socket import socket, AF_INET, SOCK_STREAM, error from socket import getnameinfo as _getnameinfo from socket import error as socket_error from socket import dup as _dup +from socket import socket, AF_INET, SOCK_STREAM import base64 # for DER-to-PEM translation import traceback @@ -296,6 +296,14 @@ class SSLSocket(socket): self._sslobj = None socket.shutdown(self, how) + 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 _real_close(self): self._sslobj = None # self._closed = True -- cgit v1.2.1