Python issue #23197: On SSL handshake failure, check if the waiter is cancelled

before setting its exception.

Add unit tests for this case.

2 files changed, 2 insertions, 2 deletions

diff --git a/asyncio/selector_events.py b/asyncio/selector_events.py
index b2f29c7..ca86264 100644
--- a/asyncio/selector_events.py
+++ b/asyncio/selector_events.py
@@ -750,7 +750,7 @@ class _SelectorSslTransport(_SelectorTransport):
             self._loop.remove_reader(self._sock_fd)
             self._loop.remove_writer(self._sock_fd)
             self._sock.close()
-            if self._waiter is not None:
+            if self._waiter is not None and not self._waiter.cancelled():
                 self._waiter.set_exception(exc)
             if isinstance(exc, Exception):
                 return
diff --git a/asyncio/sslproto.py b/asyncio/sslproto.py
index dc03cf5..541e252 100644
--- a/asyncio/sslproto.py
+++ b/asyncio/sslproto.py
@@ -552,7 +552,7 @@ class SSLProtocol(protocols.Protocol):
                                    self, exc_info=True)
             self._transport.close()
             if isinstance(exc, Exception):
-                if self._waiter is not None:
+                if self._waiter is not None and not self._waiter.cancelled():
                     self._waiter.set_exception(exc)
                 return
             else: