Bug#1106578: marked as done (unblock: python-acme/4.0.0-1) (3/3)
From
Debian Bug Tracking System@21:1/5 to
All on Mon May 26 19:50:01 2025
[continued from previous message]
# Use different certificate for challenge.
self.challenge_certs = {b'localhost': (
- test_util.load_pyopenssl_private_key('rsa4096_key.pem'),
- test_util.load_cert('rsa4096_cert.pem'),
+ serialization.load_pem_private_key(test_util.load_vector('rsa4096_key.pem'), password=None),
+ x509.load_pem_x509_certificate(test_util.load_vector('rsa4096_cert.pem')),
)}
from acme.standalone import TLSALPN01Server
self.server = TLSALPN01Server(("localhost", 0), certs=self.certs,
@@ -142,8 +144,8 @@
# cert = crypto_util.probe_sni(
# b'localhost', host=host, port=port, timeout=1)
# # Expect normal cert when connecting without ALPN.
- # self.assertEqual(jose.ComparableX509(cert),
- # jose.ComparableX509(self.certs[b'localhost'][1]))
+ # self.assertEqual(cert,
+ # self.certs[b'localhost'][1])
def test_challenge_certs(self):
host, port = self.server.socket.getsockname()[:2]
@@ -151,8 +153,7 @@
b'localhost', host=host, port=port, timeout=1,
alpn_protocols=[b"acme-tls/1"])
# Expect challenge cert when connecting with ALPN.
- assert jose.ComparableX509(cert) == \
- jose.ComparableX509(self.challenge_certs[b'localhost'][1])
+ assert cert == self.challenge_certs[b'localhost'][1]
def test_bad_alpn(self):
host, port = self.server.socket.getsockname()[:2]
@@ -193,7 +194,7 @@
from acme.standalone import BaseDualNetworkedServers
- mock_bind.side_effect = socket.error(EADDRINUSE, "Fake addr in use error")
+ mock_bind.side_effect = OSError(EADDRINUSE, "Fake addr in use error")
with pytest.raises(socket.error) as exc_info:
BaseDualNetworkedServers(
diff -Nru python-acme-2.11.0/acme/_internal/tests/testdata/csr-mixed.pem python-acme-4.0.0/acme/_internal/tests/testdata/csr-mixed.pem
--- python-acme-2.11.0/acme/_internal/tests/testdata/csr-mixed.pem 2024-06-05 17:34:02.000000000 -0400
+++ python-acme-4.0.0/acme/_internal/tests/testdata/csr-mixed.pem 2025-04-07 18:03:33.000000000 -0400
@@ -1,16 +1,16 @@
-----BEGIN CERTIFICATE REQUEST----- -MIICdjCCAV4CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXq -v1y8EIcCbaUIzCtOcLkLS0MJ35oS+6DmV5WB1A0cIk6YrjsHIsY2lwMm13BWIvmw -tY+Y6n0rr7eViNx5ZRGHpHEI/TL3Neb+VefTydL5CgvK3dd4ex2kSbTaed3fmpOx -qMajEduwNcZPCcmoEXPkfrCP8w2vKQUkQ+JRPcdX1nTuzticeRP5B7YCmJsmxkEh -Y0tzzZ+NIRDARoYNofefY86h3e5q66gtJxccNchmIM3YQahhg5n3Xoo8hGfM/TIc -R7ncCBCLO6vtqo0QFva/NQODrgOmOsmgvqPkUWQFdZfWM8yIaU826dktx0CPB78t -TudnJ1rBRvGsjHMsZikCAwEAAaAxMC8GCSqGSIb3DQEJDjEiMCAwHgYDVR0RBBcw -FYINYS5leGVtcGxlLmNvbYcEwAACbzANBgkqhkiG9w0BAQsFAAOCAQEAdGMcRCxq -1X09gn1TNdMt64XUv+wdJCKDaJ+AgyIJj7QvVw8H5k7dOnxS4I+a/yo4jE+LDl2/ -AuHcBLFEI4ddewdJSMrTNZjuRYuOdr3KP7fL7MffICSBi45vw5EOXg0tnjJCEiKu -6gcJgbLSP5JMMd7Haf33Q/VWsmHofR3VwOMdrnakwAU3Ff5WTuXTNVhL1kT/uLFX -yW1ru6BF4unwNqSR2Ueull