Merge 7e9b2c44d3 into 661efa48f0

python-stdlib/ssl/ssl.py

@@ -6,6 +6,7 @@ from tls import (
     MBEDTLS_VERSION,
     PROTOCOL_TLS_CLIENT,
     PROTOCOL_TLS_SERVER,
+    SSLSession,
 )
 
 
@@ -38,13 +39,14 @@ class SSLContext:
         self._context.load_verify_locations(cadata)
 
     def wrap_socket(
-        self, sock, server_side=False, do_handshake_on_connect=True, server_hostname=None
+        self, sock, server_side=False, do_handshake_on_connect=True, server_hostname=None, session=None,
     ):
         return self._context.wrap_socket(
             sock,
             server_side=server_side,
             do_handshake_on_connect=do_handshake_on_connect,
             server_hostname=server_hostname,
+            session=session,
         )
 
 
@@ -57,6 +59,7 @@ def wrap_socket(
     cadata=None,
     server_hostname=None,
     do_handshake=True,
+    session=None,
 ):
     con = SSLContext(PROTOCOL_TLS_SERVER if server_side else PROTOCOL_TLS_CLIENT)
     if cert or key:
@@ -69,4 +72,5 @@ def wrap_socket(
         server_side=server_side,
         do_handshake_on_connect=do_handshake,
         server_hostname=server_hostname,
+        session=session,
     )