Skip to content

Commit 2a2d1dc

Browse files
committed
Revert "gh-118658: Return consistent types from get_un/verified_chain in SSLObject and SSLSocket (#118669)"
This reverts commit 8ef358d.
1 parent 38ea8d6 commit 2a2d1dc

File tree

4 files changed

+2
-86
lines changed

4 files changed

+2
-86
lines changed

Lib/ssl.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,21 +1164,11 @@ def getpeercert(self, binary_form=False):
11641164

11651165
@_sslcopydoc
11661166
def get_verified_chain(self):
1167-
chain = self._sslobj.get_verified_chain()
1168-
1169-
if chain is None:
1170-
return []
1171-
1172-
return [cert.public_bytes(_ssl.ENCODING_DER) for cert in chain]
1167+
return self._sslobj.get_verified_chain()
11731168

11741169
@_sslcopydoc
11751170
def get_unverified_chain(self):
1176-
chain = self._sslobj.get_unverified_chain()
1177-
1178-
if chain is None:
1179-
return []
1180-
1181-
return [cert.public_bytes(_ssl.ENCODING_DER) for cert in chain]
1171+
return self._sslobj.get_unverified_chain()
11821172

11831173
@_sslcopydoc
11841174
def selected_npn_protocol(self):

Lib/test/certdata/cert3.pem

Lines changed: 0 additions & 34 deletions
This file was deleted.

Lib/test/test_ssl.py

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ def data_file(*name):
9191

9292
# Two keys and certs signed by the same CA (for SNI tests)
9393
SIGNED_CERTFILE = data_file("keycert3.pem")
94-
SINGED_CERTFILE_ONLY = data_file("cert3.pem")
9594
SIGNED_CERTFILE_HOSTNAME = 'localhost'
9695

9796
with open(data_file('keycert3.pem.reference')) as file:
@@ -4695,40 +4694,6 @@ def test_internal_chain_client(self):
46954694
ssl.PEM_cert_to_DER_cert(pem), der
46964695
)
46974696

4698-
def test_certificate_chain(self):
4699-
client_context, server_context, hostname = testing_context(
4700-
server_chain=False
4701-
)
4702-
server = ThreadedEchoServer(context=server_context, chatty=False)
4703-
4704-
with open(SIGNING_CA) as f:
4705-
expected_ca_cert = ssl.PEM_cert_to_DER_cert(f.read())
4706-
4707-
with open(SINGED_CERTFILE_ONLY) as f:
4708-
expected_ee_cert = ssl.PEM_cert_to_DER_cert(f.read())
4709-
4710-
with server:
4711-
with client_context.wrap_socket(
4712-
socket.socket(),
4713-
server_hostname=hostname
4714-
) as s:
4715-
s.connect((HOST, server.port))
4716-
vc = s.get_verified_chain()
4717-
self.assertEqual(len(vc), 2)
4718-
4719-
ee, ca = vc
4720-
self.assertIsInstance(ee, bytes)
4721-
self.assertIsInstance(ca, bytes)
4722-
self.assertEqual(expected_ca_cert, ca)
4723-
self.assertEqual(expected_ee_cert, ee)
4724-
4725-
uvc = s.get_unverified_chain()
4726-
self.assertEqual(len(uvc), 1)
4727-
self.assertIsInstance(uvc[0], bytes)
4728-
4729-
self.assertEqual(ee, uvc[0])
4730-
self.assertNotEqual(ee, ca)
4731-
47324697
def test_internal_chain_server(self):
47334698
client_context, server_context, hostname = testing_context()
47344699
client_context.load_cert_chain(SIGNED_CERTFILE)

Misc/NEWS.d/next/Library/2023-09-19-17-56-24.gh-issue-109109.WJvvX2.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)