Skip to content

Commit

Permalink
Recert to fix test failures with newer Python versions
Browse files Browse the repository at this point in the history
Newer Python versions have stronger TLS defaults, and therefore reject
the certificates currently used by the test suite.  Regenerate them
to fix most of the test failures.

This also requires bumping the protocol versions used to test min/max
version attributes, as Python no longer allows TLS<1.2.

Unfortunately, test_min_tls_version still fails and I wasn't able to
figure out a way to fix it.

Issue httplib2#192
  • Loading branch information
mgorny committed Nov 18, 2021
1 parent f4efdff commit 641ffac
Show file tree
Hide file tree
Showing 12 changed files with 178 additions and 154 deletions.
12 changes: 6 additions & 6 deletions tests/test_https.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ def test_set_tls_version(attr, version):
def test_min_tls_version():
def setup_tls(context, server, skip_errors):
skip_errors.append("WRONG_VERSION_NUMBER")
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1)
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
context.load_cert_chain(tests.SERVER_CHAIN)
return context.wrap_socket(server, server_side=True)

http = httplib2.Http(ca_certs=tests.CA_CERTS, tls_minimum_version="TLSv1_2")
http = httplib2.Http(ca_certs=tests.CA_CERTS, tls_minimum_version="TLSv1_3")
with tests.server_const_http(tls=setup_tls) as uri:
try:
http.request(uri)
Expand All @@ -117,11 +117,11 @@ def setup_tls(context, server, skip_errors):
reason="ssl doesn't support TLS min/max",
)
def test_max_tls_version():
http = httplib2.Http(ca_certs=tests.CA_CERTS, tls_maximum_version="TLSv1")
http = httplib2.Http(ca_certs=tests.CA_CERTS, tls_maximum_version="TLSv1_2")
with tests.server_const_http(tls=True) as uri:
http.request(uri)
_, tls_ver, _ = http.connections.popitem()[1].sock.cipher()
assert tls_ver == "TLSv1.0"
assert tls_ver == "TLSv1.2"


def test_client_cert_verified():
Expand All @@ -144,7 +144,7 @@ def handler(request):

assert len(cert_log) == 1
# TODO extract serial from tests.CLIENT_PEM
assert cert_log[0]["serialNumber"] == "E2AA6A96D1BF1AEC"
assert cert_log[0]["serialNumber"] == "E2AA6A96D1BF1AEF"


def test_client_cert_password_verified():
Expand All @@ -168,7 +168,7 @@ def handler(request):

assert len(cert_log) == 1
# TODO extract serial from tests.CLIENT_PEM
assert cert_log[0]["serialNumber"] == "E2AA6A96D1BF1AED"
assert cert_log[0]["serialNumber"] == "E2AA6A96D1BF1AF0"


@pytest.mark.skipif(
Expand Down
38 changes: 20 additions & 18 deletions tests/tls/ca.pem
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
-----BEGIN CERTIFICATE-----
MIIDRDCCAiwCCQC5E5PSm8flUjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJa
WjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxpYjItdGVz
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0xOTA5
MjYxNTAzMzRaFw0yOTA5MjMxNTAzMzRaMGQxCzAJBgNVBAYTAlpaMQowCAYDVQQI
DAEuMQowCAYDVQQHDAEuMRYwFAYDVQQKDA1odHRwbGliMi10ZXN0MQowCAYDVQQL
DAEuMRkwFwYDVQQDDBBodHRwbGliMi10ZXN0LUNBMIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAxBKerwr0M3230xWKMvxB20+AR9SojbQIN2/8EI9pbSrj
mlTHPFXWf02q2Ll0GPbcnSKOMnAARptVCkxEfkDGPN03Ux0jjGu2MrwZHURXM2gH
sQn33Gj3HCreFLMxIqMFfGeB9T0VxurgUek/+bR85QBVNE9GrQfrAN8O+ScOpCOE
Nh5rlYc/QscH/S0QJvttbGAZFP1bB/Xjltwd6fF3rZgCfTJ88B2UIcEVt+X/kc/0
QByPPACAnCaE4cB2q+SJVEMYP6BLDVvCPRO53UC8cqsLfpKUz73two/No4PhMHwC
PspC+wKlAD3+GWmsatz0rRysm7V0GghCGe+T5JHsGwIDAQABMA0GCSqGSIb3DQEB
CwUAA4IBAQB4b+DWt0An4YoXj7lb/+N7FVr2m5UVyBI+bbEGI/qsql/Ixiaef69M
jej7n5ucUx8GBql62W0c3/E3qZFfo49ngH1WC5gkKQH9V4jGZui5CUfmNE6WepQ/
vL6eKXUp7RoJ/hWVhGm1uV3OShF+EN0t2wZttYg4lip0FjrY8tRWdjw5yu61wWVu
WuHxTzKiHe9emjhhUBgnWRnNeYPTRs0xM2Awv5KYPq2cmrjGbSz3mYDkBpbiJUp4
pM9g8qLmsDO2yrlVF659D08+5zkmMbyqnn84X0n3SM3Yn0ayZOmbNHiXoAzklZNP
7xiyxMEAfVQOITsvSDG2PzbZlGGtbaka
MIIDqTCCApGgAwIBAgIUKFMu/rb/Mj/GcBghIflUAJrR+vEwDQYJKoZIhvcNAQEL
BQAwZDELMAkGA1UEBhMCWloxCjAIBgNVBAgMAS4xCjAIBgNVBAcMAS4xFjAUBgNV
BAoMDWh0dHBsaWIyLXRlc3QxCjAIBgNVBAsMAS4xGTAXBgNVBAMMEGh0dHBsaWIy
LXRlc3QtQ0EwHhcNMjExMTE4MDkxMzUwWhcNMzExMTE2MDkxMzUwWjBkMQswCQYD
VQQGEwJaWjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxp
YjItdGVzdDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTCC
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQSnq8K9DN9t9MVijL8QdtP
gEfUqI20CDdv/BCPaW0q45pUxzxV1n9Nqti5dBj23J0ijjJwAEabVQpMRH5Axjzd
N1MdI4xrtjK8GR1EVzNoB7EJ99xo9xwq3hSzMSKjBXxngfU9Fcbq4FHpP/m0fOUA
VTRPRq0H6wDfDvknDqQjhDYea5WHP0LHB/0tECb7bWxgGRT9Wwf145bcHenxd62Y
An0yfPAdlCHBFbfl/5HP9EAcjzwAgJwmhOHAdqvkiVRDGD+gSw1bwj0Tud1AvHKr
C36SlM+97cKPzaOD4TB8Aj7KQvsCpQA9/hlprGrc9K0crJu1dBoIQhnvk+SR7BsC
AwEAAaNTMFEwHQYDVR0OBBYEFO4nkY5yPUp2SX0KnSRLdOthTPpuMB8GA1UdIwQY
MBaAFO4nkY5yPUp2SX0KnSRLdOthTPpuMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
hvcNAQELBQADggEBADCpm9IUGQph3Co4LpIYg4Znav/3J+G1KbUg5LT9ffPAIFiZ
uE/4YnPrmDPJvzeOpC5wcN8cBrj0kf7ajTuXk8fGci0Ji3ZgAjXg9EEofabOkkF1
RmQ1AO0pwH0U08EUblm0EEEDHyAkaYrf/qaa+Dhois4tHYQT97X1lD/5CztqdbCR
hBFWp5az7AmW1HnR24iAMkv03BiW5a07U95c6f83lEKowFVHwmTZdFYojvlhYwBX
osh89yQfU3S+S2QTn6DYcbkcfB+RueW1MPQJMj7F2sFV+KXqpvbvM0XOJB4k12wZ
ziHtbIrRR6bAsYdF8FoAXZEesIDktW6tB6S2D0s=
-----END CERTIFICATE-----
2 changes: 1 addition & 1 deletion tests/tls/ca.srl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
E2AA6A96D1BF1AEE
E2AA6A96D1BF1AF1
38 changes: 20 additions & 18 deletions tests/tls/ca_unused.pem
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
-----BEGIN CERTIFICATE-----
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
-----END CERTIFICATE-----
20 changes: 11 additions & 9 deletions tests/tls/client.crt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
serial=E2AA6A96D1BF1AEF
SHA1 Fingerprint=21:6F:9A:CD:D8:BF:7E:AA:E4:B6:50:A1:55:6D:AA:C1:CC:82:A7:DE
-----BEGIN CERTIFICATE-----
MIIDSDCCAjACCQDiqmqW0b8a7DANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJa
MIIDSDCCAjACCQDiqmqW0b8a7zANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJa
WjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxpYjItdGVz
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0xOTA5
MjYxNTAzMzRaFw0yOTA5MjMxNTAzMzRaMGgxCzAJBgNVBAYTAlpaMQowCAYDVQQI
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0yMTEx
MTgwOTEzNTBaFw0zMTExMTYwOTEzNTBaMGgxCzAJBgNVBAYTAlpaMQowCAYDVQQI
DAEuMQowCAYDVQQHDAEuMRYwFAYDVQQKDA1odHRwbGliMi10ZXN0MQowCAYDVQQL
DAEuMR0wGwYDVQQDDBRodHRwbGliMi10ZXN0LWNsaWVudDCCASIwDQYJKoZIhvcN
AQEBBQADggEPADCCAQoCggEBALtXT//Esar+MDk6Gcj3KDLAyTU7jPqUx4S83LNI
Expand All @@ -11,10 +13,10 @@ q4eh0pfocsvU64dtd26TCk9Q4Qqaj4t4HSYYv1hz8UFh5RNLVjgtbR7OQ37Oumcg
jRGnelV/ck6u5BvN/fKK7p/W6hPcO9OjJDAmlVNZVPtP2ki6Lv/Q87x34X+1/Qb1
LILUOG5mdfCTmf2tYh9bXqZmqoidTY4O7/JiPuT0+1056Ja8bDGYSFXPvvqd1aEW
nGA22MEzd74w9A4tIieCRHlGGOSf0AGsVTmHKRf5bpQjaCsCAwEAATANBgkqhkiG
9w0BAQUFAAOCAQEAi/X3QjpzPap9IhpHqvgFirsEepruz8lCk+Zo6A/+DP/PocII
/8jWdIV87RDDkkaVGvWOywZyUNN1RAfrt/jGCW8xgCaSGWRab10QIW8DGhbP6FTz
7xcBnQzcoc1gggZBcwOjkRuefW2zkgGIJo5XxHlBfo3T9nX4086Py/b+VoAmcIlm
Y/LNHxtIyDDiOgGK9x7+IqEXQuo/p2z5oFubj/hyNJhXaYU2u7nNMXICYY/eY4vX
GgZ44lGZ2YR7NwzqM5UHNXr7/VJzgxWwAgyZUT8DdnjkZY4wLt1JJas5n3oldBsA
+og2cMk0oOsiFAwHAwE7St4oFY0ivKDhttf7WQ==
9w0BAQsFAAOCAQEAQixa3DCCFWOjhqQq1Y+lMRgsdVuN0knUxBzbtaKGOhRcyB7O
Y33zdHq3PCWBQXSwdxXHNJbS18GXYDMFweo1tzkmgLP2x9JjDLYtzHMn4e3n/yX5
8Ztum0uC8i86HxPtw/cKbCsR+e3Ro2YpQHC/D7Skj2zBM1+EZy1OZPwSLU1B9F0M
lNiWd/HURI5avovINvI7Y19s6ZCVnbTpaapck71RaMegafN0lCcSqqE1LovKWfjc
qtE8OkTtDIA8qVjm9XsDGj9belXjspoQqbSePnxx1fAQGdFvq/4x08ReodgeNa59
7j5N/yIDJmh8kTtZieKXph4HfiR9MnFefgk4iw==
-----END CERTIFICATE-----
20 changes: 11 additions & 9 deletions tests/tls/client.pem
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
serial=E2AA6A96D1BF1AEF
SHA1 Fingerprint=21:6F:9A:CD:D8:BF:7E:AA:E4:B6:50:A1:55:6D:AA:C1:CC:82:A7:DE
-----BEGIN CERTIFICATE-----
MIIDSDCCAjACCQDiqmqW0b8a7DANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJa
MIIDSDCCAjACCQDiqmqW0b8a7zANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJa
WjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxpYjItdGVz
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0xOTA5
MjYxNTAzMzRaFw0yOTA5MjMxNTAzMzRaMGgxCzAJBgNVBAYTAlpaMQowCAYDVQQI
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0yMTEx
MTgwOTEzNTBaFw0zMTExMTYwOTEzNTBaMGgxCzAJBgNVBAYTAlpaMQowCAYDVQQI
DAEuMQowCAYDVQQHDAEuMRYwFAYDVQQKDA1odHRwbGliMi10ZXN0MQowCAYDVQQL
DAEuMR0wGwYDVQQDDBRodHRwbGliMi10ZXN0LWNsaWVudDCCASIwDQYJKoZIhvcN
AQEBBQADggEPADCCAQoCggEBALtXT//Esar+MDk6Gcj3KDLAyTU7jPqUx4S83LNI
Expand All @@ -11,12 +13,12 @@ q4eh0pfocsvU64dtd26TCk9Q4Qqaj4t4HSYYv1hz8UFh5RNLVjgtbR7OQ37Oumcg
jRGnelV/ck6u5BvN/fKK7p/W6hPcO9OjJDAmlVNZVPtP2ki6Lv/Q87x34X+1/Qb1
LILUOG5mdfCTmf2tYh9bXqZmqoidTY4O7/JiPuT0+1056Ja8bDGYSFXPvvqd1aEW
nGA22MEzd74w9A4tIieCRHlGGOSf0AGsVTmHKRf5bpQjaCsCAwEAATANBgkqhkiG
9w0BAQUFAAOCAQEAi/X3QjpzPap9IhpHqvgFirsEepruz8lCk+Zo6A/+DP/PocII
/8jWdIV87RDDkkaVGvWOywZyUNN1RAfrt/jGCW8xgCaSGWRab10QIW8DGhbP6FTz
7xcBnQzcoc1gggZBcwOjkRuefW2zkgGIJo5XxHlBfo3T9nX4086Py/b+VoAmcIlm
Y/LNHxtIyDDiOgGK9x7+IqEXQuo/p2z5oFubj/hyNJhXaYU2u7nNMXICYY/eY4vX
GgZ44lGZ2YR7NwzqM5UHNXr7/VJzgxWwAgyZUT8DdnjkZY4wLt1JJas5n3oldBsA
+og2cMk0oOsiFAwHAwE7St4oFY0ivKDhttf7WQ==
9w0BAQsFAAOCAQEAQixa3DCCFWOjhqQq1Y+lMRgsdVuN0knUxBzbtaKGOhRcyB7O
Y33zdHq3PCWBQXSwdxXHNJbS18GXYDMFweo1tzkmgLP2x9JjDLYtzHMn4e3n/yX5
8Ztum0uC8i86HxPtw/cKbCsR+e3Ro2YpQHC/D7Skj2zBM1+EZy1OZPwSLU1B9F0M
lNiWd/HURI5avovINvI7Y19s6ZCVnbTpaapck71RaMegafN0lCcSqqE1LovKWfjc
qtE8OkTtDIA8qVjm9XsDGj9belXjspoQqbSePnxx1fAQGdFvq/4x08ReodgeNa59
7j5N/yIDJmh8kTtZieKXph4HfiR9MnFefgk4iw==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAu1dP/8Sxqv4wOToZyPcoMsDJNTuM+pTHhLzcs0ga6a4GY6Du
Expand Down
58 changes: 31 additions & 27 deletions tests/tls/client_chain.pem
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
serial=E2AA6A96D1BF1AEF
SHA1 Fingerprint=21:6F:9A:CD:D8:BF:7E:AA:E4:B6:50:A1:55:6D:AA:C1:CC:82:A7:DE
-----BEGIN CERTIFICATE-----
MIIDSDCCAjACCQDiqmqW0b8a7DANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJa
MIIDSDCCAjACCQDiqmqW0b8a7zANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJa
WjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxpYjItdGVz
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0xOTA5
MjYxNTAzMzRaFw0yOTA5MjMxNTAzMzRaMGgxCzAJBgNVBAYTAlpaMQowCAYDVQQI
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0yMTEx
MTgwOTEzNTBaFw0zMTExMTYwOTEzNTBaMGgxCzAJBgNVBAYTAlpaMQowCAYDVQQI
DAEuMQowCAYDVQQHDAEuMRYwFAYDVQQKDA1odHRwbGliMi10ZXN0MQowCAYDVQQL
DAEuMR0wGwYDVQQDDBRodHRwbGliMi10ZXN0LWNsaWVudDCCASIwDQYJKoZIhvcN
AQEBBQADggEPADCCAQoCggEBALtXT//Esar+MDk6Gcj3KDLAyTU7jPqUx4S83LNI
Expand All @@ -11,32 +13,34 @@ q4eh0pfocsvU64dtd26TCk9Q4Qqaj4t4HSYYv1hz8UFh5RNLVjgtbR7OQ37Oumcg
jRGnelV/ck6u5BvN/fKK7p/W6hPcO9OjJDAmlVNZVPtP2ki6Lv/Q87x34X+1/Qb1
LILUOG5mdfCTmf2tYh9bXqZmqoidTY4O7/JiPuT0+1056Ja8bDGYSFXPvvqd1aEW
nGA22MEzd74w9A4tIieCRHlGGOSf0AGsVTmHKRf5bpQjaCsCAwEAATANBgkqhkiG
9w0BAQUFAAOCAQEAi/X3QjpzPap9IhpHqvgFirsEepruz8lCk+Zo6A/+DP/PocII
/8jWdIV87RDDkkaVGvWOywZyUNN1RAfrt/jGCW8xgCaSGWRab10QIW8DGhbP6FTz
7xcBnQzcoc1gggZBcwOjkRuefW2zkgGIJo5XxHlBfo3T9nX4086Py/b+VoAmcIlm
Y/LNHxtIyDDiOgGK9x7+IqEXQuo/p2z5oFubj/hyNJhXaYU2u7nNMXICYY/eY4vX
GgZ44lGZ2YR7NwzqM5UHNXr7/VJzgxWwAgyZUT8DdnjkZY4wLt1JJas5n3oldBsA
+og2cMk0oOsiFAwHAwE7St4oFY0ivKDhttf7WQ==
9w0BAQsFAAOCAQEAQixa3DCCFWOjhqQq1Y+lMRgsdVuN0knUxBzbtaKGOhRcyB7O
Y33zdHq3PCWBQXSwdxXHNJbS18GXYDMFweo1tzkmgLP2x9JjDLYtzHMn4e3n/yX5
8Ztum0uC8i86HxPtw/cKbCsR+e3Ro2YpQHC/D7Skj2zBM1+EZy1OZPwSLU1B9F0M
lNiWd/HURI5avovINvI7Y19s6ZCVnbTpaapck71RaMegafN0lCcSqqE1LovKWfjc
qtE8OkTtDIA8qVjm9XsDGj9belXjspoQqbSePnxx1fAQGdFvq/4x08ReodgeNa59
7j5N/yIDJmh8kTtZieKXph4HfiR9MnFefgk4iw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIDRDCCAiwCCQC5E5PSm8flUjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJa
WjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxpYjItdGVz
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0xOTA5
MjYxNTAzMzRaFw0yOTA5MjMxNTAzMzRaMGQxCzAJBgNVBAYTAlpaMQowCAYDVQQI
DAEuMQowCAYDVQQHDAEuMRYwFAYDVQQKDA1odHRwbGliMi10ZXN0MQowCAYDVQQL
DAEuMRkwFwYDVQQDDBBodHRwbGliMi10ZXN0LUNBMIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAxBKerwr0M3230xWKMvxB20+AR9SojbQIN2/8EI9pbSrj
mlTHPFXWf02q2Ll0GPbcnSKOMnAARptVCkxEfkDGPN03Ux0jjGu2MrwZHURXM2gH
sQn33Gj3HCreFLMxIqMFfGeB9T0VxurgUek/+bR85QBVNE9GrQfrAN8O+ScOpCOE
Nh5rlYc/QscH/S0QJvttbGAZFP1bB/Xjltwd6fF3rZgCfTJ88B2UIcEVt+X/kc/0
QByPPACAnCaE4cB2q+SJVEMYP6BLDVvCPRO53UC8cqsLfpKUz73two/No4PhMHwC
PspC+wKlAD3+GWmsatz0rRysm7V0GghCGe+T5JHsGwIDAQABMA0GCSqGSIb3DQEB
CwUAA4IBAQB4b+DWt0An4YoXj7lb/+N7FVr2m5UVyBI+bbEGI/qsql/Ixiaef69M
jej7n5ucUx8GBql62W0c3/E3qZFfo49ngH1WC5gkKQH9V4jGZui5CUfmNE6WepQ/
vL6eKXUp7RoJ/hWVhGm1uV3OShF+EN0t2wZttYg4lip0FjrY8tRWdjw5yu61wWVu
WuHxTzKiHe9emjhhUBgnWRnNeYPTRs0xM2Awv5KYPq2cmrjGbSz3mYDkBpbiJUp4
pM9g8qLmsDO2yrlVF659D08+5zkmMbyqnn84X0n3SM3Yn0ayZOmbNHiXoAzklZNP
7xiyxMEAfVQOITsvSDG2PzbZlGGtbaka
MIIDqTCCApGgAwIBAgIUKFMu/rb/Mj/GcBghIflUAJrR+vEwDQYJKoZIhvcNAQEL
BQAwZDELMAkGA1UEBhMCWloxCjAIBgNVBAgMAS4xCjAIBgNVBAcMAS4xFjAUBgNV
BAoMDWh0dHBsaWIyLXRlc3QxCjAIBgNVBAsMAS4xGTAXBgNVBAMMEGh0dHBsaWIy
LXRlc3QtQ0EwHhcNMjExMTE4MDkxMzUwWhcNMzExMTE2MDkxMzUwWjBkMQswCQYD
VQQGEwJaWjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxp
YjItdGVzdDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTCC
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQSnq8K9DN9t9MVijL8QdtP
gEfUqI20CDdv/BCPaW0q45pUxzxV1n9Nqti5dBj23J0ijjJwAEabVQpMRH5Axjzd
N1MdI4xrtjK8GR1EVzNoB7EJ99xo9xwq3hSzMSKjBXxngfU9Fcbq4FHpP/m0fOUA
VTRPRq0H6wDfDvknDqQjhDYea5WHP0LHB/0tECb7bWxgGRT9Wwf145bcHenxd62Y
An0yfPAdlCHBFbfl/5HP9EAcjzwAgJwmhOHAdqvkiVRDGD+gSw1bwj0Tud1AvHKr
C36SlM+97cKPzaOD4TB8Aj7KQvsCpQA9/hlprGrc9K0crJu1dBoIQhnvk+SR7BsC
AwEAAaNTMFEwHQYDVR0OBBYEFO4nkY5yPUp2SX0KnSRLdOthTPpuMB8GA1UdIwQY
MBaAFO4nkY5yPUp2SX0KnSRLdOthTPpuMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
hvcNAQELBQADggEBADCpm9IUGQph3Co4LpIYg4Znav/3J+G1KbUg5LT9ffPAIFiZ
uE/4YnPrmDPJvzeOpC5wcN8cBrj0kf7ajTuXk8fGci0Ji3ZgAjXg9EEofabOkkF1
RmQ1AO0pwH0U08EUblm0EEEDHyAkaYrf/qaa+Dhois4tHYQT97X1lD/5CztqdbCR
hBFWp5az7AmW1HnR24iAMkv03BiW5a07U95c6f83lEKowFVHwmTZdFYojvlhYwBX
osh89yQfU3S+S2QTn6DYcbkcfB+RueW1MPQJMj7F2sFV+KXqpvbvM0XOJB4k12wZ
ziHtbIrRR6bAsYdF8FoAXZEesIDktW6tB6S2D0s=
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAu1dP/8Sxqv4wOToZyPcoMsDJNTuM+pTHhLzcs0ga6a4GY6Du
Expand Down
20 changes: 11 additions & 9 deletions tests/tls/client_encrypted.crt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
serial=E2AA6A96D1BF1AF0
SHA1 Fingerprint=FB:6D:2B:D0:50:9A:61:84:35:44:E4:35:D5:8D:59:C3:9A:AE:12:11
-----BEGIN CERTIFICATE-----
MIIDTDCCAjQCCQDiqmqW0b8a7TANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJa
MIIDTDCCAjQCCQDiqmqW0b8a8DANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJa
WjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxpYjItdGVz
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0xOTA5
MjYxNTAzMzRaFw0yOTA5MjMxNTAzMzRaMGwxCzAJBgNVBAYTAlpaMQowCAYDVQQI
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0yMTEx
MTgwOTEzNTBaFw0zMTExMTYwOTEzNTBaMGwxCzAJBgNVBAYTAlpaMQowCAYDVQQI
DAEuMQowCAYDVQQHDAEuMRYwFAYDVQQKDA1odHRwbGliMi10ZXN0MQowCAYDVQQL
DAEuMSEwHwYDVQQDDBhodHRwbGliMi10ZXN0LWNsaWVudC1lbmMwggEiMA0GCSqG
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7V0//xLGq/jA5OhnI9ygywMk1O4z6lMeE
Expand All @@ -11,10 +13,10 @@ AlpBa6uHodKX6HLL1OuHbXdukwpPUOEKmo+LeB0mGL9Yc/FBYeUTS1Y4LW0ezkN+
zrpnII0Rp3pVf3JOruQbzf3yiu6f1uoT3DvToyQwJpVTWVT7T9pIui7/0PO8d+F/
tf0G9SyC1DhuZnXwk5n9rWIfW16mZqqInU2ODu/yYj7k9PtdOeiWvGwxmEhVz776
ndWhFpxgNtjBM3e+MPQOLSIngkR5Rhjkn9ABrFU5hykX+W6UI2grAgMBAAEwDQYJ
KoZIhvcNAQEFBQADggEBAKiBTMX/FwUusM4PIsmGqXisOBo6LEf2YtfzQrtxw4eY
eWeKsi3aM2GquCqh0R7loEW+yQoxPEBaNeOBeN3v8sdhTu+9NjK31tWCYr7jvEa5
TqjlUUMD1176YBQ8axI51lVcaBIoRdvf8nXm7idvp82eBBXQtnREjd8oKcEz7v4x
ECJ+RWGJTEIWXq3fuVvBAJeopNVz+Utt61DCxziKbu+ndv0kQeXZ7KPFiBnARcEi
7GvTeHUA0cbpHrNY0ob7ozcjGiPwW5HPi+DYZYfRm2PqI9vowmKt9By+8Uz03K3L
XMZkGJ28uoo37Rbjs8+pMVDdHoUrm6hZTkw5XGgsA6I=
KoZIhvcNAQELBQADggEBAD/C66xki4p+F/CJz+8SJEObJpXJlQKcjMpGr176FIPO
gkvLwDc4Ik/lB41UnRzWbSM7W4uSjo0KH6h+S8WdcTcCr8mjWZFmS7oaG9x0+DuR
9InalnhkJwYx9cObNI5TDPW4YE6nuNmEpqb15d3wAYgteKeWOMghtREzt2OdHi1m
OJEV+RFf1265Kbot9Cw1goiISPZZGXklNb5EPjPoEyh8wPeQDR1DLsEBbyCOBD2y
HFCN+EUIzFTBBM3stUO7BiHJI5C5sWn0zi8xFo0Feu+/dvEEEZ+4xGr2VmXQeC6f
eB7SeCYFAIXggapfsazYmrwoIPABflQoXWzo0mDOaDM=
-----END CERTIFICATE-----
20 changes: 11 additions & 9 deletions tests/tls/client_encrypted.pem
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
serial=E2AA6A96D1BF1AF0
SHA1 Fingerprint=FB:6D:2B:D0:50:9A:61:84:35:44:E4:35:D5:8D:59:C3:9A:AE:12:11
-----BEGIN CERTIFICATE-----
MIIDTDCCAjQCCQDiqmqW0b8a7TANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJa
MIIDTDCCAjQCCQDiqmqW0b8a8DANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJa
WjEKMAgGA1UECAwBLjEKMAgGA1UEBwwBLjEWMBQGA1UECgwNaHR0cGxpYjItdGVz
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0xOTA5
MjYxNTAzMzRaFw0yOTA5MjMxNTAzMzRaMGwxCzAJBgNVBAYTAlpaMQowCAYDVQQI
dDEKMAgGA1UECwwBLjEZMBcGA1UEAwwQaHR0cGxpYjItdGVzdC1DQTAeFw0yMTEx
MTgwOTEzNTBaFw0zMTExMTYwOTEzNTBaMGwxCzAJBgNVBAYTAlpaMQowCAYDVQQI
DAEuMQowCAYDVQQHDAEuMRYwFAYDVQQKDA1odHRwbGliMi10ZXN0MQowCAYDVQQL
DAEuMSEwHwYDVQQDDBhodHRwbGliMi10ZXN0LWNsaWVudC1lbmMwggEiMA0GCSqG
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7V0//xLGq/jA5OhnI9ygywMk1O4z6lMeE
Expand All @@ -11,12 +13,12 @@ AlpBa6uHodKX6HLL1OuHbXdukwpPUOEKmo+LeB0mGL9Yc/FBYeUTS1Y4LW0ezkN+
zrpnII0Rp3pVf3JOruQbzf3yiu6f1uoT3DvToyQwJpVTWVT7T9pIui7/0PO8d+F/
tf0G9SyC1DhuZnXwk5n9rWIfW16mZqqInU2ODu/yYj7k9PtdOeiWvGwxmEhVz776
ndWhFpxgNtjBM3e+MPQOLSIngkR5Rhjkn9ABrFU5hykX+W6UI2grAgMBAAEwDQYJ
KoZIhvcNAQEFBQADggEBAKiBTMX/FwUusM4PIsmGqXisOBo6LEf2YtfzQrtxw4eY
eWeKsi3aM2GquCqh0R7loEW+yQoxPEBaNeOBeN3v8sdhTu+9NjK31tWCYr7jvEa5
TqjlUUMD1176YBQ8axI51lVcaBIoRdvf8nXm7idvp82eBBXQtnREjd8oKcEz7v4x
ECJ+RWGJTEIWXq3fuVvBAJeopNVz+Utt61DCxziKbu+ndv0kQeXZ7KPFiBnARcEi
7GvTeHUA0cbpHrNY0ob7ozcjGiPwW5HPi+DYZYfRm2PqI9vowmKt9By+8Uz03K3L
XMZkGJ28uoo37Rbjs8+pMVDdHoUrm6hZTkw5XGgsA6I=
KoZIhvcNAQELBQADggEBAD/C66xki4p+F/CJz+8SJEObJpXJlQKcjMpGr176FIPO
gkvLwDc4Ik/lB41UnRzWbSM7W4uSjo0KH6h+S8WdcTcCr8mjWZFmS7oaG9x0+DuR
9InalnhkJwYx9cObNI5TDPW4YE6nuNmEpqb15d3wAYgteKeWOMghtREzt2OdHi1m
OJEV+RFf1265Kbot9Cw1goiISPZZGXklNb5EPjPoEyh8wPeQDR1DLsEBbyCOBD2y
HFCN+EUIzFTBBM3stUO7BiHJI5C5sWn0zi8xFo0Feu+/dvEEEZ+4xGr2VmXQeC6f
eB7SeCYFAIXggapfsazYmrwoIPABflQoXWzo0mDOaDM=
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
Expand Down

0 comments on commit 641ffac

Please sign in to comment.