From 412ccf4c6f8c417006c0a93392a8274a425074c0 Mon Sep 17 00:00:00 2001

From: Victor Stinner <vstinner@redhat.com>

Date: Wed, 29 May 2019 04:04:54 +0200

Subject: [PATCH 1/5] bpo-32947: test_ssl fixes for TLS 1.3 and OpenSSL 1.1.1

 (GH-11612)

Backport partially commit 529525fb5a8fd9b96ab4021311a598c77588b918:

complete the previous partial backport (commit

2a4ee8aa01d61b6a9c8e9c65c211e61bdb471826.

Co-Authored-By: Christian Heimes <christian@python.org>

---

 Lib/test/test_ssl.py                              | 15 +++++++++++++++

 .../2019-01-18-17-46-10.bpo-32947.Hk0KnM.rst      |  1 +

 2 files changed, 16 insertions(+)

 create mode 100644 Misc/NEWS.d/next/Tests/2019-01-18-17-46-10.bpo-32947.Hk0KnM.rst

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py

index cb0acda..639109f 100644

--- a/Lib/test/test_ssl.py

+++ b/Lib/test/test_ssl.py

@@ -2043,6 +2043,16 @@ if _have_threads:

                                 sys.stdout.write(" server: read %r (%s), sending back %r (%s)...\n"

                                                  % (msg, ctype, msg.lower(), ctype))

                             self.write(msg.lower())

+                    except ConnectionResetError:

+                        # XXX: OpenSSL 1.1.1 sometimes raises ConnectionResetError

+                        # when connection is not shut down gracefully.

+                        if self.server.chatty and support.verbose:

+                            sys.stdout.write(

+                                " Connection reset by peer: {}\n".format(

+                                    self.addr)

+                            )

+                        self.close()

+                        self.running = False

                     except OSError:

                         if self.server.chatty:

                             handle_error("Test server failure:\n")

@@ -2122,6 +2132,11 @@ if _have_threads:

                     pass

                 except KeyboardInterrupt:

                     self.stop()

+                except BaseException as e:

+                    if support.verbose and self.chatty:

+                        sys.stdout.write(

+                            ' connection handling failed: ' + repr(e) + '\n')

+

             self.sock.close()

         def stop(self):

diff --git a/Misc/NEWS.d/next/Tests/2019-01-18-17-46-10.bpo-32947.Hk0KnM.rst b/Misc/NEWS.d/next/Tests/2019-01-18-17-46-10.bpo-32947.Hk0KnM.rst

new file mode 100644

index 0000000..f508504

--- /dev/null

+++ b/Misc/NEWS.d/next/Tests/2019-01-18-17-46-10.bpo-32947.Hk0KnM.rst

@@ -0,0 +1 @@

+test_ssl fixes for TLS 1.3 and OpenSSL 1.1.1.

-- 

2.21.0

From 6b728ec778067849dd1f0d9b73cf1ac47dafa270 Mon Sep 17 00:00:00 2001

From: "Miss Islington (bot)"

 <31488909+miss-islington@users.noreply.github.com>

Date: Wed, 25 Sep 2019 09:12:59 -0700

Subject: [PATCH 2/5] bpo-38271: encrypt private key test files with AES256

 (GH-16385)

The private keys for test_ssl were encrypted with 3DES in traditional

PKCSGH-5 format. 3DES and the digest algorithm of PKCSGH-5 are blocked by

some strict crypto policies. Use PKCSGH-8 format with AES256 encryption

instead.

Signed-off-by: Christian Heimes <christian@python.org>

https://bugs.python.org/issue38271

Automerge-Triggered-By: @tiran

(cherry picked from commit bfd0c963d88f3df69489ee250655e2b8f3d235bd)

Co-authored-by: Christian Heimes <christian@python.org>

---

 Lib/test/keycert.passwd.pem                   | 85 ++++++++++---------

 Lib/test/make_ssl_certs.py                    |  4 +-

 Lib/test/ssl_key.passwd.pem                   | 84 +++++++++---------

 .../2019-09-25-13-11-29.bpo-38271.iHXNIg.rst  |  4 +

 4 files changed, 91 insertions(+), 86 deletions(-)

 create mode 100644 Misc/NEWS.d/next/Tests/2019-09-25-13-11-29.bpo-38271.iHXNIg.rst

diff --git a/Lib/test/keycert.passwd.pem b/Lib/test/keycert.passwd.pem

index cbb3c3b..c330c36 100644

--- a/Lib/test/keycert.passwd.pem

+++ b/Lib/test/keycert.passwd.pem

@@ -1,45 +1,45 @@

------BEGIN RSA PRIVATE KEY-----

-Proc-Type: 4,ENCRYPTED

-DEK-Info: DES-EDE3-CBC,D134E931C96D9DEC

-

-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

------END RSA PRIVATE KEY-----

+-----BEGIN ENCRYPTED PRIVATE KEY-----

+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

+-----END ENCRYPTED PRIVATE KEY-----

 -----BEGIN CERTIFICATE-----

 MIIEWTCCAsGgAwIBAgIJAJinz4jHSjLtMA0GCSqGSIb3DQEBCwUAMF8xCzAJBgNV

 BAYTAlhZMRcwFQYDVQQHDA5DYXN0bGUgQW50aHJheDEjMCEGA1UECgwaUHl0aG9u

@@ -66,3 +66,4 @@ jMqTFlmO7kpf/jpCSmamp3/JSEE1BJKHwQ6Ql4nzRA2N1mnvWH7Zxcv043gkHeAu

 9Wc2uXpw9xF8itV4Uvcdr3dwqByvIqn7iI/gB+4l41e0u8OmH2MKOx4Nxlly5TNW

 HcVKQHyOeyvnINuBAQ==

 -----END CERTIFICATE-----

+

diff --git a/Lib/test/make_ssl_certs.py b/Lib/test/make_ssl_certs.py

index 3622765..41b5f46 100644

--- a/Lib/test/make_ssl_certs.py

+++ b/Lib/test/make_ssl_certs.py

@@ -206,8 +206,8 @@ if __name__ == '__main__':

     with open('ssl_key.pem', 'w') as f:

         f.write(key)

     print("password protecting ssl_key.pem in ssl_key.passwd.pem")

-    check_call(['openssl','rsa','-in','ssl_key.pem','-out','ssl_key.passwd.pem','-des3','-passout','pass:somepass'])

-    check_call(['openssl','rsa','-in','ssl_key.pem','-out','keycert.passwd.pem','-des3','-passout','pass:somepass'])

+    check_call(['openssl','pkey','-in','ssl_key.pem','-out','ssl_key.passwd.pem','-aes256','-passout','pass:somepass'])

+    check_call(['openssl','pkey','-in','ssl_key.pem','-out','keycert.passwd.pem','-aes256','-passout','pass:somepass'])

     with open('keycert.pem', 'w') as f:

         f.write(key)

diff --git a/Lib/test/ssl_key.passwd.pem b/Lib/test/ssl_key.passwd.pem

index e4f1370..46de61a 100644

--- a/Lib/test/ssl_key.passwd.pem

+++ b/Lib/test/ssl_key.passwd.pem

@@ -1,42 +1,42 @@

------BEGIN RSA PRIVATE KEY-----

-Proc-Type: 4,ENCRYPTED

-DEK-Info: DES-EDE3-CBC,8064BE1494B24B13

-

-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

------END RSA PRIVATE KEY-----

+-----BEGIN ENCRYPTED PRIVATE KEY-----

+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

+-----END ENCRYPTED PRIVATE KEY-----

diff --git a/Misc/NEWS.d/next/Tests/2019-09-25-13-11-29.bpo-38271.iHXNIg.rst b/Misc/NEWS.d/next/Tests/2019-09-25-13-11-29.bpo-38271.iHXNIg.rst

new file mode 100644

index 0000000..8f43d32

--- /dev/null

+++ b/Misc/NEWS.d/next/Tests/2019-09-25-13-11-29.bpo-38271.iHXNIg.rst

@@ -0,0 +1,4 @@

+The private keys for test_ssl were encrypted with 3DES in traditional

+PKCS#5 format. 3DES and the digest algorithm of PKCS#5 are blocked by

+some strict crypto policies. Use PKCS#8 format with AES256 encryption

+instead.

-- 

2.21.0

From d8584f9bb3fb841a1b21ed25abc2237ea8bbc206 Mon Sep 17 00:00:00 2001

From: Charalampos Stratakis <cstratak@redhat.com>

Date: Tue, 26 Nov 2019 23:57:21 +0100

Subject: [PATCH 3/5] Use PROTOCOL_TLS_CLIENT/SERVER

Replaces PROTOCOL_TLSv* and PROTOCOL_SSLv23 with PROTOCOL_TLS_CLIENT and

PROTOCOL_TLS_SERVER.

Partially backports a170fa162dc03f0a014373349e548954fff2e567

---

 Lib/ssl.py               |   7 +-

 Lib/test/test_logging.py |   2 +-

 Lib/test/test_ssl.py     | 169 +++++++++++++++++++--------------------

 3 files changed, 87 insertions(+), 91 deletions(-)

diff --git a/Lib/ssl.py b/Lib/ssl.py

index 0114387..c5c5529 100644

--- a/Lib/ssl.py

+++ b/Lib/ssl.py

@@ -473,7 +473,7 @@ def create_default_context(purpose=Purpose.SERVER_AUTH, *, cafile=None,

         context.load_default_certs(purpose)

     return context

-def _create_unverified_context(protocol=PROTOCOL_TLS, *, cert_reqs=None,

+def _create_unverified_context(protocol=PROTOCOL_TLS, *, cert_reqs=CERT_NONE,

                            check_hostname=False, purpose=Purpose.SERVER_AUTH,

                            certfile=None, keyfile=None,

                            cafile=None, capath=None, cadata=None):

@@ -492,9 +492,12 @@ def _create_unverified_context(protocol=PROTOCOL_TLS, *, cert_reqs=None,

     # by default.

     context = SSLContext(protocol)

+    if not check_hostname:

+        context.check_hostname = False

     if cert_reqs is not None:

         context.verify_mode = cert_reqs

-    context.check_hostname = check_hostname

+    if check_hostname:

+        context.check_hostname = True

     if keyfile and not certfile:

         raise ValueError("certfile must be specified")

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py

index 763a5d1..d5c63b4 100644

--- a/Lib/test/test_logging.py

+++ b/Lib/test/test_logging.py

@@ -1830,7 +1830,7 @@ class HTTPHandlerTest(BaseTest):

                 else:

                     here = os.path.dirname(__file__)

                     localhost_cert = os.path.join(here, "keycert.pem")

-                    sslctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)

+                    sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)

                     sslctx.load_cert_chain(localhost_cert)

                     context = ssl.create_default_context(cafile=localhost_cert)

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py

index 639109f..a7bf2f7 100644

--- a/Lib/test/test_ssl.py

+++ b/Lib/test/test_ssl.py

@@ -155,6 +155,8 @@ def test_wrap_socket(sock, ssl_version=ssl.PROTOCOL_TLS, *,

                      **kwargs):

     context = ssl.SSLContext(ssl_version)

     if cert_reqs is not None:

+        if cert_reqs == ssl.CERT_NONE:

+            context.check_hostname = False

         context.verify_mode = cert_reqs

     if ca_certs is not None:

         context.load_verify_locations(ca_certs)

@@ -1377,7 +1379,7 @@ class ContextTests(unittest.TestCase):

         self._assert_context_options(ctx)

     def test_check_hostname(self):

-        ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

+        ctx = ssl.SSLContext(ssl.PROTOCOL_TLS)

         self.assertFalse(ctx.check_hostname)

         # Requires CERT_REQUIRED or CERT_OPTIONAL

@@ -2386,17 +2388,13 @@ if _have_threads:

                     server_params_test(context, context,

                                        chatty=True, connectionchatty=True)

-            client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)

-            client_context.load_verify_locations(SIGNING_CA)

-            server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)

-            # server_context.load_verify_locations(SIGNING_CA)

-            server_context.load_cert_chain(SIGNED_CERTFILE2)

+            client_context, server_context, hostname = testing_context()

             with self.subTest(client=ssl.PROTOCOL_TLS_CLIENT, server=ssl.PROTOCOL_TLS_SERVER):

                 server_params_test(client_context=client_context,

                                    server_context=server_context,

                                    chatty=True, connectionchatty=True,

-                                   sni_name='fakehostname')

+                                   sni_name='localhost')

             client_context.check_hostname = False

             with self.subTest(client=ssl.PROTOCOL_TLS_SERVER, server=ssl.PROTOCOL_TLS_CLIENT):

@@ -2404,7 +2402,7 @@ if _have_threads:

                     server_params_test(client_context=server_context,

                                        server_context=client_context,

                                        chatty=True, connectionchatty=True,

-                                       sni_name='fakehostname')

+                                       sni_name='localhost')

                 self.assertIn('called a function you should not call',

                               str(e.exception))

@@ -2469,39 +2467,38 @@ if _have_threads:

             if support.verbose:

                 sys.stdout.write("\n")

-            server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            server_context.load_cert_chain(SIGNED_CERTFILE)

+            client_context, server_context, hostname = testing_context()

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            context.verify_mode = ssl.CERT_REQUIRED

-            context.load_verify_locations(SIGNING_CA)

             tf = getattr(ssl, "VERIFY_X509_TRUSTED_FIRST", 0)

-            self.assertEqual(context.verify_flags, ssl.VERIFY_DEFAULT | tf)

+            self.assertEqual(client_context.verify_flags, ssl.VERIFY_DEFAULT | tf)

             # VERIFY_DEFAULT should pass

             server = ThreadedEchoServer(context=server_context, chatty=True)

             with server:

-                with context.wrap_socket(socket.socket()) as s:

+                with client_context.wrap_socket(socket.socket(),

+                                                server_hostname=hostname) as s:

                     s.connect((HOST, server.port))

                     cert = s.getpeercert()

                     self.assertTrue(cert, "Can't get peer certificate.")

             # VERIFY_CRL_CHECK_LEAF without a loaded CRL file fails

-            context.verify_flags |= ssl.VERIFY_CRL_CHECK_LEAF

+            client_context.verify_flags |= ssl.VERIFY_CRL_CHECK_LEAF

             server = ThreadedEchoServer(context=server_context, chatty=True)

             with server:

-                with context.wrap_socket(socket.socket()) as s:

+                with client_context.wrap_socket(socket.socket(),

+                                                server_hostname=hostname) as s:

                     with self.assertRaisesRegex(ssl.SSLError,

                                                 "certificate verify failed"):

                         s.connect((HOST, server.port))

             # now load a CRL file. The CRL file is signed by the CA.

-            context.load_verify_locations(CRLFILE)

+            client_context.load_verify_locations(CRLFILE)

             server = ThreadedEchoServer(context=server_context, chatty=True)

             with server:

-                with context.wrap_socket(socket.socket()) as s:

+                with client_context.wrap_socket(socket.socket(),

+                                                server_hostname=hostname) as s:

                     s.connect((HOST, server.port))

                     cert = s.getpeercert()

                     self.assertTrue(cert, "Can't get peer certificate.")

@@ -2510,19 +2507,13 @@ if _have_threads:

             if support.verbose:

                 sys.stdout.write("\n")

-            server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            server_context.load_cert_chain(SIGNED_CERTFILE)

-

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            context.verify_mode = ssl.CERT_REQUIRED

-            context.check_hostname = True

-            context.load_verify_locations(SIGNING_CA)

+            client_context, server_context, hostname = testing_context()

             # correct hostname should verify

             server = ThreadedEchoServer(context=server_context, chatty=True)

             with server:

-                with context.wrap_socket(socket.socket(),

-                                         server_hostname="localhost") as s:

+                with client_context.wrap_socket(socket.socket(),

+                                                 server_hostname=hostname) as s:

                     s.connect((HOST, server.port))

                     cert = s.getpeercert()

                     self.assertTrue(cert, "Can't get peer certificate.")

@@ -2530,7 +2521,7 @@ if _have_threads:

             # incorrect hostname should raise an exception

             server = ThreadedEchoServer(context=server_context, chatty=True)

             with server:

-                with context.wrap_socket(socket.socket(),

+                with client_context.wrap_socket(socket.socket(),

                                          server_hostname="invalid") as s:

                     with self.assertRaisesRegex(ssl.CertificateError,

                                                 "hostname 'invalid' doesn't match 'localhost'"):

@@ -2542,7 +2533,7 @@ if _have_threads:

                 with socket.socket() as s:

                     with self.assertRaisesRegex(ValueError,

                                                 "check_hostname requires server_hostname"):

-                        context.wrap_socket(s)

+                        client_context.wrap_socket(s)

         def test_wrong_cert(self):

             """Connecting when the server rejects the client's certificate

@@ -2767,7 +2758,6 @@ if _have_threads:

             msgs = (b"msg 1", b"MSG 2", b"STARTTLS", b"MSG 3", b"msg 4", b"ENDTLS", b"msg 5", b"msg 6")

             server = ThreadedEchoServer(CERTFILE,

-                                        ssl_version=ssl.PROTOCOL_TLSv1,

                                         starttls_server=True,

                                         chatty=True,

                                         connectionchatty=True)

@@ -2795,7 +2785,7 @@ if _have_threads:

                             sys.stdout.write(

                                 " client:  read %r from server, starting TLS...\n"

                                 % msg)

-                        conn = test_wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1)

+                        conn = test_wrap_socket(s)

                         wrapped = True

                     elif indata == b"ENDTLS" and msg.startswith(b"ok"):

                         # ENDTLS ok, switch back to clear text

@@ -2882,7 +2872,7 @@ if _have_threads:

             server = ThreadedEchoServer(CERTFILE,

                                         certreqs=ssl.CERT_NONE,

-                                        ssl_version=ssl.PROTOCOL_TLSv1,

+                                        ssl_version=ssl.PROTOCOL_TLS_SERVER,

                                         cacerts=CERTFILE,

                                         chatty=True,

                                         connectionchatty=False)

@@ -2892,7 +2882,7 @@ if _have_threads:

                                     certfile=CERTFILE,

                                     ca_certs=CERTFILE,

                                     cert_reqs=ssl.CERT_NONE,

-                                    ssl_version=ssl.PROTOCOL_TLSv1)

+                                    ssl_version=ssl.PROTOCOL_TLS_CLIENT)

                 s.connect((HOST, server.port))

                 # helper methods for standardising recv* method signatures

                 def _recv_into():

@@ -3034,7 +3024,7 @@ if _have_threads:

         def test_nonblocking_send(self):

             server = ThreadedEchoServer(CERTFILE,

                                         certreqs=ssl.CERT_NONE,

-                                        ssl_version=ssl.PROTOCOL_TLSv1,

+                                        ssl_version=ssl.PROTOCOL_TLS_SERVER,

                                         cacerts=CERTFILE,

                                         chatty=True,

                                         connectionchatty=False)

@@ -3044,7 +3034,7 @@ if _have_threads:

                                     certfile=CERTFILE,

                                     ca_certs=CERTFILE,

                                     cert_reqs=ssl.CERT_NONE,

-                                    ssl_version=ssl.PROTOCOL_TLSv1)

+                                    ssl_version=ssl.PROTOCOL_TLS_CLIENT)

                 s.connect((HOST, server.port))

                 s.setblocking(False)

@@ -3190,9 +3180,11 @@ if _have_threads:

             Basic tests for SSLSocket.version().

             More tests are done in the test_protocol_*() methods.

             """

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

+            context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)

+            context.check_hostname = False

+            context.verify_mode = ssl.CERT_NONE

             with ThreadedEchoServer(CERTFILE,

-                                    ssl_version=ssl.PROTOCOL_TLSv1,

+                                    ssl_version=ssl.PROTOCOL_TLS_SERVER,

                                     chatty=False) as server:

                 with context.wrap_socket(socket.socket()) as s:

                     self.assertIs(s.version(), None)

@@ -3247,7 +3239,7 @@ if _have_threads:

             server = ThreadedEchoServer(CERTFILE,

                                         certreqs=ssl.CERT_NONE,

-                                        ssl_version=ssl.PROTOCOL_TLSv1,

+                                        ssl_version=ssl.PROTOCOL_TLS_SERVER,

                                         cacerts=CERTFILE,

                                         chatty=True,

                                         connectionchatty=False)

@@ -3257,7 +3249,7 @@ if _have_threads:

                                     certfile=CERTFILE,

                                     ca_certs=CERTFILE,

                                     cert_reqs=ssl.CERT_NONE,

-                                    ssl_version=ssl.PROTOCOL_TLSv1)

+                                    ssl_version=ssl.PROTOCOL_TLS_CLIENT)

                 s.connect((HOST, server.port))

                 # get the data

                 cb_data = s.get_channel_binding("tls-unique")

@@ -3282,7 +3274,7 @@ if _have_threads:

                                     certfile=CERTFILE,

                                     ca_certs=CERTFILE,

                                     cert_reqs=ssl.CERT_NONE,

-                                    ssl_version=ssl.PROTOCOL_TLSv1)

+                                    ssl_version=ssl.PROTOCOL_TLS_CLIENT)

                 s.connect((HOST, server.port))

                 new_cb_data = s.get_channel_binding("tls-unique")

                 if support.verbose:

@@ -3299,32 +3291,35 @@ if _have_threads:

                 s.close()

         def test_compression(self):

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            context.load_cert_chain(CERTFILE)

-            stats = server_params_test(context, context,

-                                       chatty=True, connectionchatty=True)

+            client_context, server_context, hostname = testing_context()

+            stats = server_params_test(client_context, server_context,

+                                       chatty=True, connectionchatty=True,

+                                       sni_name=hostname)

             if support.verbose:

                 sys.stdout.write(" got compression: {!r}\n".format(stats['compression']))

             self.assertIn(stats['compression'], { None, 'ZLIB', 'RLE' })

+

         @unittest.skipUnless(hasattr(ssl, 'OP_NO_COMPRESSION'),

                              "ssl.OP_NO_COMPRESSION needed for this test")

         def test_compression_disabled(self):

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            context.load_cert_chain(CERTFILE)

-            context.options |= ssl.OP_NO_COMPRESSION

-            stats = server_params_test(context, context,

-                                       chatty=True, connectionchatty=True)

+            client_context, server_context, hostname = testing_context()

+            client_context.options |= ssl.OP_NO_COMPRESSION

+            server_context.options |= ssl.OP_NO_COMPRESSION

+            stats = server_params_test(client_context, server_context,

+                                       chatty=True, connectionchatty=True,

+                                       sni_name=hostname)

             self.assertIs(stats['compression'], None)

         def test_dh_params(self):

             # Check we can get a connection with ephemeral Diffie-Hellman

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            context.load_cert_chain(CERTFILE)

-            context.load_dh_params(DHFILE)

-            context.set_ciphers("kEDH")

-            stats = server_params_test(context, context,

-                                       chatty=True, connectionchatty=True)

+            client_context, server_context, hostname = testing_context()

+            server_context.load_dh_params(DHFILE)

+            server_context.set_ciphers("kEDH")

+            server_context.options |= ssl.OP_NO_TLSv1_3

+            stats = server_params_test(client_context, server_context,

+                                       chatty=True, connectionchatty=True,

+                                       sni_name=hostname)

             cipher = stats["cipher"][0]

             parts = cipher.split("-")

             if "ADH" not in parts and "EDH" not in parts and "DHE" not in parts:

@@ -3332,22 +3327,20 @@ if _have_threads:

         def test_selected_alpn_protocol(self):

             # selected_alpn_protocol() is None unless ALPN is used.

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            context.load_cert_chain(CERTFILE)

-            stats = server_params_test(context, context,

-                                       chatty=True, connectionchatty=True)

+            client_context, server_context, hostname = testing_context()

+            stats = server_params_test(client_context, server_context,

+                                       chatty=True, connectionchatty=True,

+                                       sni_name=hostname)

             self.assertIs(stats['client_alpn_protocol'], None)

         @unittest.skipUnless(ssl.HAS_ALPN, "ALPN support required")

         def test_selected_alpn_protocol_if_server_uses_alpn(self):

             # selected_alpn_protocol() is None unless ALPN is used by the client.

-            client_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            client_context.load_verify_locations(CERTFILE)

-            server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            server_context.load_cert_chain(CERTFILE)

+            client_context, server_context, hostname = testing_context()

             server_context.set_alpn_protocols(['foo', 'bar'])

             stats = server_params_test(client_context, server_context,

-                                       chatty=True, connectionchatty=True)

+                                       chatty=True, connectionchatty=True,

+                                       sni_name=hostname)

             self.assertIs(stats['client_alpn_protocol'], None)

         @unittest.skipUnless(ssl.HAS_ALPN, "ALPN support needed for this test")

@@ -3394,10 +3387,10 @@ if _have_threads:

         def test_selected_npn_protocol(self):

             # selected_npn_protocol() is None unless NPN is used

-            context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            context.load_cert_chain(CERTFILE)

-            stats = server_params_test(context, context,

-                                       chatty=True, connectionchatty=True)

+            client_context, server_context, hostname = testing_context()

+            stats = server_params_test(client_context, server_context,

+                                       chatty=True, connectionchatty=True,

+                                       sni_name=hostname)

             self.assertIs(stats['client_npn_protocol'], None)

         @unittest.skipUnless(ssl.HAS_NPN, "NPN support needed for this test")

@@ -3430,12 +3423,11 @@ if _have_threads:

                 self.assertEqual(server_result, expected, msg % (server_result, "server"))

         def sni_contexts(self):

-            server_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

+            server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)

             server_context.load_cert_chain(SIGNED_CERTFILE)

-            other_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

+            other_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)

             other_context.load_cert_chain(SIGNED_CERTFILE2)

-            client_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)

-            client_context.verify_mode = ssl.CERT_REQUIRED

+            client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)

             client_context.load_verify_locations(SIGNING_CA)

             return server_context, other_context, client_context

@@ -3448,6 +3440,8 @@ if _have_threads:

             calls = []

             server_context, other_context, client_context = self.sni_contexts()

+            client_context.check_hostname = False

+

             def servername_cb(ssl_sock, server_name, initial_context):

                 calls.append((server_name, initial_context))

                 if server_name is not None:

@@ -3533,11 +3527,7 @@ if _have_threads:

             self.assertIn("TypeError", stderr.getvalue())

         def test_shared_ciphers(self):