diff --git a/test/common/tls/ocsp/test_data/README.md b/test/common/tls/ocsp/test_data/README.md
index ad1c6777eb3a..87a450f4808e 100644
--- a/test/common/tls/ocsp/test_data/README.md
+++ b/test/common/tls/ocsp/test_data/README.md
@@ -28,3 +28,5 @@ There are 8 identities:
 will cause all files to be regenerated. So if you want to regenerate a
 particular file, please copy the corresponding commands from certs.sh and
 execute them in command line.
+
+NOTE: This requires openssl 1.1
diff --git a/test/common/tls/ocsp/test_data/ca_cert.pem b/test/common/tls/ocsp/test_data/ca_cert.pem
index c5c98f7d178e..64cabbaf8046 100644
--- a/test/common/tls/ocsp/test_data/ca_cert.pem
+++ b/test/common/tls/ocsp/test_data/ca_cert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID0zCCArugAwIBAgIUGIR6NlZ17lyrZ5N9uK2g0QLW5TIwDQYJKoZIhvcNAQEL
-BQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
-DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIyMTAyMzAyMjQyOVoXDTI0MTAyMjAy
-MjQyOVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
-BAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQg
-RW5naW5lZXJpbmcxCzAJBgNVBAMMAmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvXEqixfAmuBA47KSQuSJ4aQ1+o1VvwGMIPmy3oeYbj1Wvfs36YOq
-ON9tFtOzjM5u8gCkv/FQUnALMswi2F+l44f7i7KFb7iUxR5qCw2kVWCgyyqWRH/p
-MZue9HBFWYNpXNaryf26vOYmeKzlSgJuKA8RRuF4sAtPQ/OQmm5B/WntWZUWZUNG
-CAO46wcKKEU0SiJD4HNjfu7yId2nZikXfXo5jjvqiXoeG/zVSOkn/B0IDEiTYX/A
-bUqIlDUdIDWg1xU27Rfzkc8Fy6x4f7of6ZT0YzYbaLEAShTNDRc0aaIBGzcjW1rR
-zBgOANy24wreP6Nh2HN3tvKWuHi/oDFaawIDAQABo2MwYTAdBgNVHQ4EFgQUnMwf
-jZCg7pLeJOgYYEk/vsPVVokwHwYDVR0jBBgwFoAUnMwfjZCg7pLeJOgYYEk/vsPV
-VokwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggEBAAT0vnyixkk53PYiYRT3GmNK5oHocdTDLHhCWeHIHTw+bLo0TTJR7NtF
-1VWY0ar+xS3Gsx5aLxSVsMKqLLD1jMGHmQxiHqh90La+HzjlOOnxCzcGrTiWMr5N
-L7mrzEIHnKoC5/130zlBhgFhA/kMNQOejJRPOChpCDlz25Oc6RK+hP/BLFz1+VFd
-3XEDgTdsp3LNA8hf/nSuv1dsdzuH9oq1hXKjHEUhWnQEmWXh8wNB9qYu/dGAjikU
-WGotBR4ROciz6Vwl5MMb+67ls3/J0hSeZ8XlXVP8DWnY4maUCd286QPEkjuvTgQW
-Zkup1o6TL+5NQSoujamT6D/C9rynHGc=
+MIIDyDCCArCgAwIBAgIJANYQM2akDsuvMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
+c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQsw
+CQYDVQQDDAJjYTAeFw0yNDEwMjIxNDUwMzBaFw0yNjEwMjIxNDUwMzBaMHExCzAJ
+BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJh
+bmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5n
+MQswCQYDVQQDDAJjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeC
+iroYk1XQ6zI8/qVWqX+0XEUxuIP/vmUffA81xT1xDJf9QFLmM8ObXjIWn/vQo3Mr
+gpQU1NuFwM9YJWtYGBIa2QVBW7udH26cGb8AC/KUrxE+ZU1eg9bQf/aoeh0WFl9a
+XwgzwoxePP+QH/p2Ed+HsmUGm0N/aimy7Jjo2UBcZ/LwaCerUaFgtQitqUeljZDa
+abQ9i1sjIDFn2S1C1gobchXq8aDTeQqUIBpeBYi41GTXW0IcnWs3iJEDoEc6nwQO
+e3SEQB0aN8gqhlffOYP9aNO3SibnzsGn/d0Jlxnl6s65BlWTrPOYySvHx2QjkUib
+37Rp/xYtIGO64a/RRgkCAwEAAaNjMGEwHQYDVR0OBBYEFEi3D6ji+Yvie4Ly3jif
+Miz8+BzLMB8GA1UdIwQYMBaAFEi3D6ji+Yvie4Ly3jifMiz8+BzLMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQCppp9i
+Q7ClrtBFDNrH1n5kRFAPZhpNSmZUg5Qv91fVpQstpH0BOLTsTAQIOJzHZJh7xCau
+syqXhemBFIgObbiZGFtKmwAWUkEWFpRMqCmlng6W6OIvUVMHxiyFEk2xTB6DrNHG
+xEuLLaZu0Pu4Cd9CWOzcxFabeZVISU03OVrbhGgXsAG9n7/7GOkFaCks/76MWSDM
+a/A6jO+YSV+hEz/7eWBsZzwMtJPi6Ynh03+GrJEgTZPglP+ArY3bbUePQBtHkl43
+fOuPPVFzksYy3KuLgQytZaWEXoukyDa/TomjgdQEavmg+1SZ/8qbo0dF9lqwDuUy
+N0y3c/Nk7Lc0t9yP
 -----END CERTIFICATE-----
diff --git a/test/common/tls/ocsp/test_data/ca_key.pem b/test/common/tls/ocsp/test_data/ca_key.pem
index 7ed25605fe60..a95e74219a7d 100644
--- a/test/common/tls/ocsp/test_data/ca_key.pem
+++ b/test/common/tls/ocsp/test_data/ca_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpQIBAAKCAQEAt4KKuhiTVdDrMjz+pVapf7RcRTG4g/++ZR98DzXFPXEMl/1A
+UuYzw5teMhaf+9CjcyuClBTU24XAz1gla1gYEhrZBUFbu50fbpwZvwAL8pSvET5l
+TV6D1tB/9qh6HRYWX1pfCDPCjF48/5Af+nYR34eyZQabQ39qKbLsmOjZQFxn8vBo
+J6tRoWC1CK2pR6WNkNpptD2LWyMgMWfZLULWChtyFerxoNN5CpQgGl4FiLjUZNdb
+QhydazeIkQOgRzqfBA57dIRAHRo3yCqGV985g/1o07dKJufOwaf93QmXGeXqzrkG
+VZOs85jJK8fHZCORSJvftGn/Fi0gY7rhr9FGCQIDAQABAoIBAQCAEWmRkF8aj8/k
+Yq7wYneuOQf//kAgVtXgKsXgs4zwYToBxGskr6VGiOKHIEUMb0HyuVXK1HLstP6n
+dYO/014RHI2CXmePmor6HZTWOEkeRWecKCh4g1KNEzuKv29hZy275AzYY48NeSMm
+08WNfOLiVghI+wBWbdCAQ29dE3uyrtuy6rZNUf82KsqNNwBrIbHCoVSRcMixxtb5
+nqdrDSVyPb4uUV3AxUR3K/ucI47F7B/ZWGjF+ReWv06NDDwFFKODXp2Kfi1AEB3X
+19bRbIsGSh9RepzWe1/ZeYCckUfHvz5BBZOIdg14rUZ+9A+zVKSOH546nNhcevD3
+tndNGwnlAoGBAOO0pTpxqO/pGODRNalKBLfCtZu5DNPfCZj7A4lYKAJ3caxt4Eay
+0/FitTpp/h6gWqDfpxBcot7hTKgCR5mq6nUge8PPlK4KnTuY2gO3OxPrsulm23xM
+bx6mU4ogl/kOiXuNSqwyUw0Sib8kDY4Xd1W70zfspHxlSu886ZU50zDrAoGBAM5Q
+BfqaQyCbQkztH5ad4x+nNBKdl3ViUlA3m8ey0wLoCsZvIEc1eAxDOX66OYtzuPYg
+mX3bX5L7abKB20IHZqquUJp/u5F6QjQhFpBsVUps7yL0r8wIpbXIfqNKKRBzjZyb
+vj5i8J5GNR8nHn6NPBqq5scUJpgr13FdZ6JhcAfbAoGARKGI/4GMgqsGJZTJELpP
+i7dzF3mCBUX/VY2qtjXM8Vlg+LCxXX2+5c1zhCS4RDDewAhJCWRybq0HdsghHo7m
+VeExjIY/cOmgFHtwkpgihVGQPksTMnazM1C8czB5vcaE56lhbV9JqvIAdI0ATOiD
+vmJ7OiroNNou6Ma6PJEON3sCgYEAm845RbE8IqK95kRpR6DDBoOKQsi6ug5fpW7p
+eV2mF5rPkF4Z3U0W9QPLptXSYWsqcs3ZvP9v5RtzDjkdMXdPZHSyMItoRowy9RVL
+6hO2MbekvRxWqtqY8niQkpaN/nuVpYDEom6r0ouo0HcFg4L7shQAprWkE+WAFX/5
+pNq69WMCgYEAjbSm1lRUuOnEKrbUevLQ/44qQKovKcOboKHowVOwnWsOeR/yzbXZ
+iuexh4IL4MYz65Hazqb4txzPX+f5kz+7pQyFyQncbTBPUrq5UB4EpwKi8/XQ74uX
+N9xWz43w93CnAfW8UYDhLR/Qq4j2y53cCjCEMtgQKji3L2YhyaSNamk=
 -----END RSA PRIVATE KEY-----
diff --git a/test/common/tls/ocsp/test_data/ecdsa_cert.pem b/test/common/tls/ocsp/test_data/ecdsa_cert.pem
index 738a5a262734..1406033eb53e 100644
--- a/test/common/tls/ocsp/test_data/ecdsa_cert.pem
+++ b/test/common/tls/ocsp/test_data/ecdsa_cert.pem
@@ -2,15 +2,15 @@
 MIICdzCCAV8CAhACMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNVBAYTAlVTMRMwEQYD
 VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK
 DARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQswCQYDVQQDDAJjYTAe
-Fw0yMjEwMjMwMjI0MzBaFw0yNDEwMjIwMjI0MzBaMFwxCzAJBgNVBAYTAlVTMRMw
+Fw0yNDEwMjIxNDUwMzBaFw0yNjEwMjIxNDUwMzBaMFwxCzAJBgNVBAYTAlVTMRMw
 EQYDVQQIDApDYWxpZm9ybmlhMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0
 IEVuZ2luZWVyaW5nMQ4wDAYDVQQDDAVlY2RzYTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABF9j5Nj82s+FE1VDPNJICcZOvWjaoV8TM6tQ4iCduJe42vIGprWVxcgn
-Twc7mzCiuZRbmXyugxTGfc9BJpY2qG0wDQYJKoZIhvcNAQELBQADggEBAGf5RI7m
-KahYnZSihIPkSv+jrkrSJExIwOjYkYQnFkH2QiplEU2n/2T2wyM8JsmslbJ96eL6
-rP5yspFywQFehgBvm02OI4HykpMCLcizTKrdKANTeKJb+8BoQFX5wlVpJ/Uc2pIs
-th2kWfNiTPhqO+CxheyT1V0QRTALz+e4WD7gBla9hxiVGzu5LY0TaoKWvgGUoQWy
-MDXmpyY4fgqV7levQ4i47DeR6Q0DKd50AwMMsm6ueI0JYWvqfSu8KmtdH9ae9c+C
-ll6yCwJvUvaAZ/0mxJvM+2eJmjvNZn8fIe4hSXKjmoFwgY4m3JE0waFX3BifDKGr
-i9kQQD4p6SeRjP4=
+AwEHA0IABNvnVfd1WmxVZJdhs63BkaGG3fM0myZHOAqLpKvj00/AaLxv0y6guEaQ
+7guCTCOREOr61+J8LrbqclgIW1qFHGwwDQYJKoZIhvcNAQELBQADggEBABCCMdeD
+eQMLhL3WAxcroAxq+Er6czCW4ET/hyYB7GOjeBCDwwwOlF65SjqzeWyd13B2jtZ5
+QS7hRA/DCWvne7BWTKwcuRtTPZ4l5uV6WbOxaJ8EAXsrPif+CLZFO6SbiNKLczf2
+Uz2oNUv/tFc7D1BvrQCQHA8cLokdaXSTYG39adrNiqz5xjhAJamCAIp6vEWq0nuL
+AHUPkgkTzkMRdDEPP6xA8JkrFBLB/8ljbu2OJHy2ryED8XBPvzuff9QsqSRhEEOg
+RiZsXoA4duvIzuGcFW2Qhc+KbiTCSoV8av9l5fl1R5jC+0xfcmAT/vLjccP7pl92
+JkID1WYY+v9Bq+o=
 -----END CERTIFICATE-----
diff --git a/test/common/tls/ocsp/test_data/ecdsa_key.pem b/test/common/tls/ocsp/test_data/ecdsa_key.pem
index 99a6e1f5b694..c3b1b57ebebc 100644
--- a/test/common/tls/ocsp/test_data/ecdsa_key.pem
+++ b/test/common/tls/ocsp/test_data/ecdsa_key.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIGwYbBaoZMHNNam3qe/GTARZDtNO1VJv7h38q5N4Dt3JoAoGCCqGSM49
-AwEHoUQDQgAEX2Pk2Pzaz4UTVUM80kgJxk69aNqhXxMzq1DiIJ24l7ja8gamtZXF
-yCdPBzubMKK5lFuZfK6DFMZ9z0EmljaobQ==
+MHcCAQEEIGyvpqUmOkrhuZ/5AH8eOK9V7OxP2VSpAmTJib/sqQ42oAoGCCqGSM49
+AwEHoUQDQgAE2+dV93VabFVkl2GzrcGRoYbd8zSbJkc4Coukq+PTT8BovG/TLqC4
+RpDuC4JMI5EQ6vrX4nwutupyWAhbWoUcbA==
 -----END EC PRIVATE KEY-----
diff --git a/test/common/tls/ocsp/test_data/ecdsa_ocsp_req.der b/test/common/tls/ocsp/test_data/ecdsa_ocsp_req.der
index 99bd3a19e348..99c87cf00cd4 100644
Binary files a/test/common/tls/ocsp/test_data/ecdsa_ocsp_req.der and b/test/common/tls/ocsp/test_data/ecdsa_ocsp_req.der differ
diff --git a/test/common/tls/ocsp/test_data/ecdsa_ocsp_resp.der b/test/common/tls/ocsp/test_data/ecdsa_ocsp_resp.der
index fa41eee455f6..53ea02980d99 100644
Binary files a/test/common/tls/ocsp/test_data/ecdsa_ocsp_resp.der and b/test/common/tls/ocsp/test_data/ecdsa_ocsp_resp.der differ
diff --git a/test/common/tls/ocsp/test_data/good_cert.pem b/test/common/tls/ocsp/test_data/good_cert.pem
index e462b37b73ae..a6aa9d28f4da 100644
--- a/test/common/tls/ocsp/test_data/good_cert.pem
+++ b/test/common/tls/ocsp/test_data/good_cert.pem
@@ -2,19 +2,19 @@
 MIIDQTCCAikCAhAAMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNVBAYTAlVTMRMwEQYD
 VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK
 DARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQswCQYDVQQDDAJjYTAe
-Fw0yMjEwMjMwMjI0MzBaFw0yNDEwMjIwMjI0MzBaMFsxCzAJBgNVBAYTAlVTMRMw
+Fw0yNDEwMjIxNDUwMzBaFw0yNjEwMjIxNDUwMzBaMFsxCzAJBgNVBAYTAlVTMRMw
 EQYDVQQIDApDYWxpZm9ybmlhMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0
 IEVuZ2luZWVyaW5nMQ0wCwYDVQQDDARnb29kMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAusNi96t2ccNA5QsGUdVgtJeQYI5f9PzuhLhLxWG4JfM0KVjk
-1ONCjBGvn/8/22oyNASQx1FsFZqHFqhaflS3WagWQNyL/arq6VO9H/xZXBATrVL2
-TvjOMzi9d4xffQn+6/c7ddGYB6g1O2ov2KDG+nF5+12/QgeXjmK2NPhgvtOB8u4u
-5FXk/dM8A7Stg3+74ooog+yClhlGmNh45nChyxCnUW88e+LW8dsuI3CEEt2cIa+A
-8/vNM0xUh0BDXL45TzaW6zlk2bjkIRoFxUdwY4xyMuhLPiA+rgmAJHb/Viu520xf
-79XUbtvM4WaMtZLcSiSe0QmK/TCGEh1HWMJS+wIDAQABMA0GCSqGSIb3DQEBCwUA
-A4IBAQAyze7uaaRk5teHYahhUVvBs8t5N8A8SfZz+3eN25OvrgCne72CqZUAFqUN
-LV0QCZ9no+xo+x9p0vcLorCntYDuwaUFxKzjx95e/XtQSZwbURDuA+TtDRl1dsBK
-gFDCHWkOggSjQ6nivQ/9kKq68WOw7hY8kUYY5k7eqKjQghRh+67leHJM9RKzSTCZ
-/DTmCqhZjq6C5T9OllW6r8KObvu+9AP/+3ozUuZaOQP5zUl4/2RFuy4swUPsOW3a
-CPSJd63HxJJIA+ITV1hy3Uzfemh5UGZKrgMP34ykWrUcN0tio8Ed0c0/+UACJiVg
-NI0CaZP92sXLwtJJePM0J1utRrMO
+AQ8AMIIBCgKCAQEAq+1b/FRoGHVsy1KqGxEL43qDCM9r12zqiCnCTGp3XI3DAV0V
+WCA3OrMWJp+7KwS8pszQQQVzqP4wCDjp+Qrz4XFLE4++OP6nSGJa3rVi6dj9arYi
+ijUCf/B8OAYa3sV4bPMVPgKQfnZ/p1yXbIG5n3/I3cH4pP9yOLgGrstAvQpLG02M
+p+Q+N+OFOIkl51CNjaIbGkDjjilZEal8XzGFK3SoUB1LtfDfOya35LvL3D/8e+I7
+CgxmHcrnt1q0jIZywVkOs+CJfesMjcG8NCQ4FmsN0d5vHTAyFbkYxC6OiI9p8H2t
+GwEU4tyS5cU8aERZgretKBX6nWEzHbZ2JqUJDQIDAQABMA0GCSqGSIb3DQEBCwUA
+A4IBAQBv0AGsWfqV1OSnFjenO/8j1ys4kLeNaAWJsEdC6NUr32Qx7WTiYoRo+jjE
+beel37vGwbJF+J2O3dORHHQv9kKJOCLzSNu+kKlqaeh1BnGL35TfhnupqXmJ3NwR
+4J/3B9LPOtGsWvvZ6jKj+abDeFTQi/PU1X9klgf07ELHF2M/Pm7va39Ho8FIUxZH
+TR3Aln3UcevzC79SVtRRUdmBUxUcAZ52XSBJBDzX2izTkTGIy0IKbhvdaZdVBPp4
+ozGIqR8jUe3Xy/2QDkjRB9EOYHJY3kB4XwofO7mmjqif+NS4HI7sI1BroXNVe3Oh
+0N9ihN4yVoJuHSBf1RcTUPQyNhRp
 -----END CERTIFICATE-----
diff --git a/test/common/tls/ocsp/test_data/good_key.pem b/test/common/tls/ocsp/test_data/good_key.pem
index fabd2e9546cb..aa81a3c9a510 100644
--- a/test/common/tls/ocsp/test_data/good_key.pem
+++ b/test/common/tls/ocsp/test_data/good_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/common/tls/ocsp/test_data/good_ocsp_req.der b/test/common/tls/ocsp/test_data/good_ocsp_req.der
index cc13804ae218..60d57a79f6d7 100644
Binary files a/test/common/tls/ocsp/test_data/good_ocsp_req.der and b/test/common/tls/ocsp/test_data/good_ocsp_req.der differ
diff --git a/test/common/tls/ocsp/test_data/good_ocsp_resp.der b/test/common/tls/ocsp/test_data/good_ocsp_resp.der
index 6a7d307b5fb6..dd7782ef567e 100644
Binary files a/test/common/tls/ocsp/test_data/good_ocsp_resp.der and b/test/common/tls/ocsp/test_data/good_ocsp_resp.der differ
diff --git a/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt b/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt
index 4afb6c4c591e..8b7581091f45 100644
--- a/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt
+++ b/test/common/tls/ocsp/test_data/good_ocsp_resp_details.txt
@@ -3,116 +3,116 @@ OCSP Response Data:
     Response Type: Basic OCSP Response
     Version: 1 (0x0)
     Responder Id: C = US, ST = California, L = San Francisco, O = Lyft, OU = Lyft Engineering, CN = ca
-    Produced At: Oct 23 02:24:30 2022 GMT
+    Produced At: Oct 22 14:50:30 2024 GMT
     Responses:
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 16C50680A809B68F302789AB234F8F4B30B0E06C
-      Issuer Key Hash: 9CCC1F8D90A0EE92DE24E81860493FBEC3D55689
+      Issuer Key Hash: 48B70FA8E2F98BE27B82F2DE389F322CFCF81CCB
       Serial Number: 1000
     Cert Status: good
-    This Update: Oct 23 02:24:30 2022 GMT
-    Next Update: Oct 22 02:24:30 2024 GMT
+    This Update: Oct 22 14:50:30 2024 GMT
+    Next Update: Oct 22 14:50:30 2026 GMT
 
     Response Extensions:
-        OCSP Nonce:
-            0410A6DB264F79FBA79B5B4B41EFB5386AFE
+        OCSP Nonce: 
+            0410D26A9562C852A29C61A0799E51252A7A
     Signature Algorithm: sha256WithRSAEncryption
-         71:bf:88:91:25:37:99:1a:1b:24:c3:e6:b4:43:68:ae:d6:be:
-         54:11:24:e6:56:23:e9:dc:10:a4:20:c0:07:65:6d:6b:48:ed:
-         24:4d:bd:df:68:9b:ac:12:b0:1b:ac:c8:7a:17:d6:5b:b5:87:
-         c7:6f:39:38:ce:8a:16:5b:1e:22:da:98:01:16:9c:ac:98:73:
-         5c:56:0a:bc:42:f9:49:9d:06:54:26:f8:e7:c9:d1:bc:b2:2a:
-         7c:ca:7a:dd:69:fc:16:71:26:f6:74:85:37:88:3f:4a:22:17:
-         a1:8c:2b:29:96:98:b9:dc:a1:e4:da:96:0f:ef:46:8c:0d:60:
-         a1:1d:0e:29:a7:03:ba:78:c9:7a:1a:4c:01:7c:7e:ef:ae:45:
-         5c:f7:14:49:2c:29:b9:54:c0:b4:e3:5a:05:a9:9c:bb:5c:f1:
-         64:f0:6c:77:54:0f:fc:e7:d2:ce:49:98:24:74:91:67:34:b8:
-         7c:51:55:d4:cf:3d:06:a4:9f:4c:76:91:c7:65:6d:f1:1a:68:
-         ee:90:7a:d3:d5:23:11:7e:eb:8d:c9:11:04:bd:fa:24:50:52:
-         4d:73:f5:00:cd:bf:6c:87:1d:1f:2c:de:99:3a:96:4a:65:c3:
-         25:13:54:05:b8:39:4a:a0:cb:63:40:d2:14:1f:a3:b3:da:ce:
-         9d:c3:f9:76
+         a3:43:04:dc:64:84:b0:b4:81:ef:58:40:50:e1:69:10:ed:4a:
+         86:71:4e:ee:68:9a:84:68:57:54:c4:29:57:b7:08:89:fa:a4:
+         18:06:a8:3f:ae:8d:b1:d3:e5:06:4b:91:c0:5e:7c:71:08:d2:
+         ec:e7:17:d6:3f:92:c6:fa:ff:d0:99:69:dd:69:a0:b6:b2:95:
+         5f:8b:a9:02:0a:b6:3e:1c:22:3d:fa:6e:81:08:ac:9d:89:65:
+         3f:d8:7e:5f:88:86:1f:4b:e8:91:ee:d5:a3:2a:6b:30:77:f2:
+         e4:cd:18:d8:ac:61:b2:87:57:5e:0d:da:d5:29:1d:bc:51:14:
+         28:38:ef:b4:13:47:da:be:e2:4c:43:c4:01:ad:9d:3c:88:da:
+         38:d9:5f:48:75:f7:cc:de:05:1f:42:25:2b:85:dd:0f:28:28:
+         91:e9:58:20:9b:79:61:bb:0b:70:40:f5:b8:f2:6f:bb:fd:b0:
+         f7:7f:c1:2e:f8:a5:b3:9a:93:3c:4e:b1:37:c3:ce:a7:be:00:
+         d6:d6:f3:c9:a3:b2:46:ff:cd:f6:89:ee:4b:fc:23:96:1e:20:
+         d9:77:b4:05:40:ae:5c:97:e4:bc:9d:5e:0d:36:0c:1f:62:70:
+         4e:35:7a:9c:f5:6c:4e:91:b2:85:d8:8f:04:23:e3:67:1c:9d:
+         5b:12:f9:1d
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            18:84:7a:36:56:75:ee:5c:ab:67:93:7d:b8:ad:a0:d1:02:d6:e5:32
-        Signature Algorithm: sha256WithRSAEncryption
+            d6:10:33:66:a4:0e:cb:af
+    Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, L=San Francisco, O=Lyft, OU=Lyft Engineering, CN=ca
         Validity
-            Not Before: Oct 23 02:24:29 2022 GMT
-            Not After : Oct 22 02:24:29 2024 GMT
+            Not Before: Oct 22 14:50:30 2024 GMT
+            Not After : Oct 22 14:50:30 2026 GMT
         Subject: C=US, ST=California, L=San Francisco, O=Lyft, OU=Lyft Engineering, CN=ca
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:bd:71:2a:8b:17:c0:9a:e0:40:e3:b2:92:42:e4:
-                    89:e1:a4:35:fa:8d:55:bf:01:8c:20:f9:b2:de:87:
-                    98:6e:3d:56:bd:fb:37:e9:83:aa:38:df:6d:16:d3:
-                    b3:8c:ce:6e:f2:00:a4:bf:f1:50:52:70:0b:32:cc:
-                    22:d8:5f:a5:e3:87:fb:8b:b2:85:6f:b8:94:c5:1e:
-                    6a:0b:0d:a4:55:60:a0:cb:2a:96:44:7f:e9:31:9b:
-                    9e:f4:70:45:59:83:69:5c:d6:ab:c9:fd:ba:bc:e6:
-                    26:78:ac:e5:4a:02:6e:28:0f:11:46:e1:78:b0:0b:
-                    4f:43:f3:90:9a:6e:41:fd:69:ed:59:95:16:65:43:
-                    46:08:03:b8:eb:07:0a:28:45:34:4a:22:43:e0:73:
-                    63:7e:ee:f2:21:dd:a7:66:29:17:7d:7a:39:8e:3b:
-                    ea:89:7a:1e:1b:fc:d5:48:e9:27:fc:1d:08:0c:48:
-                    93:61:7f:c0:6d:4a:88:94:35:1d:20:35:a0:d7:15:
-                    36:ed:17:f3:91:cf:05:cb:ac:78:7f:ba:1f:e9:94:
-                    f4:63:36:1b:68:b1:00:4a:14:cd:0d:17:34:69:a2:
-                    01:1b:37:23:5b:5a:d1:cc:18:0e:00:dc:b6:e3:0a:
-                    de:3f:a3:61:d8:73:77:b6:f2:96:b8:78:bf:a0:31:
-                    5a:6b
+                    00:b7:82:8a:ba:18:93:55:d0:eb:32:3c:fe:a5:56:
+                    a9:7f:b4:5c:45:31:b8:83:ff:be:65:1f:7c:0f:35:
+                    c5:3d:71:0c:97:fd:40:52:e6:33:c3:9b:5e:32:16:
+                    9f:fb:d0:a3:73:2b:82:94:14:d4:db:85:c0:cf:58:
+                    25:6b:58:18:12:1a:d9:05:41:5b:bb:9d:1f:6e:9c:
+                    19:bf:00:0b:f2:94:af:11:3e:65:4d:5e:83:d6:d0:
+                    7f:f6:a8:7a:1d:16:16:5f:5a:5f:08:33:c2:8c:5e:
+                    3c:ff:90:1f:fa:76:11:df:87:b2:65:06:9b:43:7f:
+                    6a:29:b2:ec:98:e8:d9:40:5c:67:f2:f0:68:27:ab:
+                    51:a1:60:b5:08:ad:a9:47:a5:8d:90:da:69:b4:3d:
+                    8b:5b:23:20:31:67:d9:2d:42:d6:0a:1b:72:15:ea:
+                    f1:a0:d3:79:0a:94:20:1a:5e:05:88:b8:d4:64:d7:
+                    5b:42:1c:9d:6b:37:88:91:03:a0:47:3a:9f:04:0e:
+                    7b:74:84:40:1d:1a:37:c8:2a:86:57:df:39:83:fd:
+                    68:d3:b7:4a:26:e7:ce:c1:a7:fd:dd:09:97:19:e5:
+                    ea:ce:b9:06:55:93:ac:f3:98:c9:2b:c7:c7:64:23:
+                    91:48:9b:df:b4:69:ff:16:2d:20:63:ba:e1:af:d1:
+                    46:09
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
-            X509v3 Subject Key Identifier:
-                9C:CC:1F:8D:90:A0:EE:92:DE:24:E8:18:60:49:3F:BE:C3:D5:56:89
-            X509v3 Authority Key Identifier:
-                keyid:9C:CC:1F:8D:90:A0:EE:92:DE:24:E8:18:60:49:3F:BE:C3:D5:56:89
+            X509v3 Subject Key Identifier: 
+                48:B7:0F:A8:E2:F9:8B:E2:7B:82:F2:DE:38:9F:32:2C:FC:F8:1C:CB
+            X509v3 Authority Key Identifier: 
+                keyid:48:B7:0F:A8:E2:F9:8B:E2:7B:82:F2:DE:38:9F:32:2C:FC:F8:1C:CB
 
             X509v3 Basic Constraints: critical
                 CA:TRUE
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
     Signature Algorithm: sha256WithRSAEncryption
-         04:f4:be:7c:a2:c6:49:39:dc:f6:22:61:14:f7:1a:63:4a:e6:
-         81:e8:71:d4:c3:2c:78:42:59:e1:c8:1d:3c:3e:6c:ba:34:4d:
-         32:51:ec:db:45:d5:55:98:d1:aa:fe:c5:2d:c6:b3:1e:5a:2f:
-         14:95:b0:c2:aa:2c:b0:f5:8c:c1:87:99:0c:62:1e:a8:7d:d0:
-         b6:be:1f:38:e5:38:e9:f1:0b:37:06:ad:38:96:32:be:4d:2f:
-         b9:ab:cc:42:07:9c:aa:02:e7:fd:77:d3:39:41:86:01:61:03:
-         f9:0c:35:03:9e:8c:94:4f:38:28:69:08:39:73:db:93:9c:e9:
-         12:be:84:ff:c1:2c:5c:f5:f9:51:5d:dd:71:03:81:37:6c:a7:
-         72:cd:03:c8:5f:fe:74:ae:bf:57:6c:77:3b:87:f6:8a:b5:85:
-         72:a3:1c:45:21:5a:74:04:99:65:e1:f3:03:41:f6:a6:2e:fd:
-         d1:80:8e:29:14:58:6a:2d:05:1e:11:39:c8:b3:e9:5c:25:e4:
-         c3:1b:fb:ae:e5:b3:7f:c9:d2:14:9e:67:c5:e5:5d:53:fc:0d:
-         69:d8:e2:66:94:09:dd:bc:e9:03:c4:92:3b:af:4e:04:16:66:
-         4b:a9:d6:8e:93:2f:ee:4d:41:2a:2e:8d:a9:93:e8:3f:c2:f6:
-         bc:a7:1c:67
+         a9:a6:9f:62:43:b0:a5:ae:d0:45:0c:da:c7:d6:7e:64:44:50:
+         0f:66:1a:4d:4a:66:54:83:94:2f:f7:57:d5:a5:0b:2d:a4:7d:
+         01:38:b4:ec:4c:04:08:38:9c:c7:64:98:7b:c4:26:ae:b3:2a:
+         97:85:e9:81:14:88:0e:6d:b8:99:18:5b:4a:9b:00:16:52:41:
+         16:16:94:4c:a8:29:a5:9e:0e:96:e8:e2:2f:51:53:07:c6:2c:
+         85:12:4d:b1:4c:1e:83:ac:d1:c6:c4:4b:8b:2d:a6:6e:d0:fb:
+         b8:09:df:42:58:ec:dc:c4:56:9b:79:95:48:49:4d:37:39:5a:
+         db:84:68:17:b0:01:bd:9f:bf:fb:18:e9:05:68:29:2c:ff:be:
+         8c:59:20:cc:6b:f0:3a:8c:ef:98:49:5f:a1:13:3f:fb:79:60:
+         6c:67:3c:0c:b4:93:e2:e9:89:e1:d3:7f:86:ac:91:20:4d:93:
+         e0:94:ff:80:ad:8d:db:6d:47:8f:40:1b:47:92:5e:37:7c:eb:
+         8f:3d:51:73:92:c6:32:dc:ab:8b:81:0c:ad:65:a5:84:5e:8b:
+         a4:c8:36:bf:4e:89:a3:81:d4:04:6a:f9:a0:fb:54:99:ff:ca:
+         9b:a3:47:45:f6:5a:b0:0e:e5:32:37:4c:b7:73:f3:64:ec:b7:
+         34:b7:dc:8f
 -----BEGIN CERTIFICATE-----
-MIID0zCCArugAwIBAgIUGIR6NlZ17lyrZ5N9uK2g0QLW5TIwDQYJKoZIhvcNAQEL
-BQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
-DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIyMTAyMzAyMjQyOVoXDTI0MTAyMjAy
-MjQyOVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
-BAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQg
-RW5naW5lZXJpbmcxCzAJBgNVBAMMAmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvXEqixfAmuBA47KSQuSJ4aQ1+o1VvwGMIPmy3oeYbj1Wvfs36YOq
-ON9tFtOzjM5u8gCkv/FQUnALMswi2F+l44f7i7KFb7iUxR5qCw2kVWCgyyqWRH/p
-MZue9HBFWYNpXNaryf26vOYmeKzlSgJuKA8RRuF4sAtPQ/OQmm5B/WntWZUWZUNG
-CAO46wcKKEU0SiJD4HNjfu7yId2nZikXfXo5jjvqiXoeG/zVSOkn/B0IDEiTYX/A
-bUqIlDUdIDWg1xU27Rfzkc8Fy6x4f7of6ZT0YzYbaLEAShTNDRc0aaIBGzcjW1rR
-zBgOANy24wreP6Nh2HN3tvKWuHi/oDFaawIDAQABo2MwYTAdBgNVHQ4EFgQUnMwf
-jZCg7pLeJOgYYEk/vsPVVokwHwYDVR0jBBgwFoAUnMwfjZCg7pLeJOgYYEk/vsPV
-VokwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggEBAAT0vnyixkk53PYiYRT3GmNK5oHocdTDLHhCWeHIHTw+bLo0TTJR7NtF
-1VWY0ar+xS3Gsx5aLxSVsMKqLLD1jMGHmQxiHqh90La+HzjlOOnxCzcGrTiWMr5N
-L7mrzEIHnKoC5/130zlBhgFhA/kMNQOejJRPOChpCDlz25Oc6RK+hP/BLFz1+VFd
-3XEDgTdsp3LNA8hf/nSuv1dsdzuH9oq1hXKjHEUhWnQEmWXh8wNB9qYu/dGAjikU
-WGotBR4ROciz6Vwl5MMb+67ls3/J0hSeZ8XlXVP8DWnY4maUCd286QPEkjuvTgQW
-Zkup1o6TL+5NQSoujamT6D/C9rynHGc=
+MIIDyDCCArCgAwIBAgIJANYQM2akDsuvMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
+c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQsw
+CQYDVQQDDAJjYTAeFw0yNDEwMjIxNDUwMzBaFw0yNjEwMjIxNDUwMzBaMHExCzAJ
+BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJh
+bmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5n
+MQswCQYDVQQDDAJjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeC
+iroYk1XQ6zI8/qVWqX+0XEUxuIP/vmUffA81xT1xDJf9QFLmM8ObXjIWn/vQo3Mr
+gpQU1NuFwM9YJWtYGBIa2QVBW7udH26cGb8AC/KUrxE+ZU1eg9bQf/aoeh0WFl9a
+XwgzwoxePP+QH/p2Ed+HsmUGm0N/aimy7Jjo2UBcZ/LwaCerUaFgtQitqUeljZDa
+abQ9i1sjIDFn2S1C1gobchXq8aDTeQqUIBpeBYi41GTXW0IcnWs3iJEDoEc6nwQO
+e3SEQB0aN8gqhlffOYP9aNO3SibnzsGn/d0Jlxnl6s65BlWTrPOYySvHx2QjkUib
+37Rp/xYtIGO64a/RRgkCAwEAAaNjMGEwHQYDVR0OBBYEFEi3D6ji+Yvie4Ly3jif
+Miz8+BzLMB8GA1UdIwQYMBaAFEi3D6ji+Yvie4Ly3jifMiz8+BzLMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQCppp9i
+Q7ClrtBFDNrH1n5kRFAPZhpNSmZUg5Qv91fVpQstpH0BOLTsTAQIOJzHZJh7xCau
+syqXhemBFIgObbiZGFtKmwAWUkEWFpRMqCmlng6W6OIvUVMHxiyFEk2xTB6DrNHG
+xEuLLaZu0Pu4Cd9CWOzcxFabeZVISU03OVrbhGgXsAG9n7/7GOkFaCks/76MWSDM
+a/A6jO+YSV+hEz/7eWBsZzwMtJPi6Ynh03+GrJEgTZPglP+ArY3bbUePQBtHkl43
+fOuPPVFzksYy3KuLgQytZaWEXoukyDa/TomjgdQEavmg+1SZ/8qbo0dF9lqwDuUy
+N0y3c/Nk7Lc0t9yP
 -----END CERTIFICATE-----
diff --git a/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem b/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem
index 5eefdf36969e..1a143136b7a6 100644
--- a/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem
+++ b/test/common/tls/ocsp/test_data/intermediate_ca_cert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIUejmvf9DJvCI7vezPwrKvCGvPbYUwDQYJKoZIhvcNAQEL
-BQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
-DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIyMTAyMzAyMjQzMFoXDTI0MTAyMjAy
-MjQzMFowfjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
-BAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQg
-RW5naW5lZXJpbmcxGDAWBgNVBAMMD2ludGVybWVkaWF0ZV9jYTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMVvNEurRsxwkmJsa+72JbrrhH23l9F6CDto
-fFcqJ4UCSBE8s446mi8PqYjjmNxWp7SfWDsOAKHpYujRgZoDyBRApLtvwCqz9Uwj
-n9shfcpDgyPjiytkQj0UwoX6zYz9G0pVsJKDx4ATwiO/ZNxIaPt3ZIMyP0BKhdUo
-NeVkwGI0sqXPj1ds/K+ZA1WEcOUJQZVTnbTBXGwtXaNkRThe3soEUMtlnYZnFzgl
-sqgadUIbcMUuPevQsF/l0qBijmOU3BVgyn7CWxToDPuTrmZrLhDRy0YT19O6M+L6
-u23Z35Bl2jmZxW6u7BLLDQcAC844CZLcDdUkZT1CBaHuevnfuR8CAwEAAaOBxTCB
-wjAdBgNVHQ4EFgQU66QFDCm7FIGcid+aOhQubD1zZwgwHwYDVR0jBBgwFoAU66QF
-DCm7FIGcid+aOhQubD1zZwgwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFOukBQwpuxSBnInfmjoULmw9c2cIMB8GA1UdIwQYMBaAFJzM
-H42QoO6S3iToGGBJP77D1VaJMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgGGMA0GCSqGSIb3DQEBCwUAA4IBAQBnjObW8BPFzPahhIhzte3FOIQhZxahgqma
-fvWJX8zq+nsV2v32cSI3Hg5D4gchC80kd33pupk6ZFCUtY4T2okiGPxDmvBJh1rG
-vP6dtDrXPsL1lcSt6L/DPncbZZjUckkeyh4i5dhIALt3h7qGVEipHnzQNmRNpfE1
-gbNmHs9TiF8Hqdl6KEEI8jBFZ7ecVzp2sx8poDuB7csiApUqoHjEDjV4g6v0IvdY
-cjaYZpRR3KKn+xJri6gOjeg3poy5u2QSz3KxxSYfr69pSGDBXlba0HtIbg+3dbHw
-rM5gR3p3o0ij7Rns0a8JjhGZmuezqS2DncZq/BePKaCZHs88Vbg6
+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
+0wIkN48GBo4SxjzMluikNIRFT8v2hRAILo9rjA==
 -----END CERTIFICATE-----
diff --git a/test/common/tls/ocsp/test_data/intermediate_ca_key.pem b/test/common/tls/ocsp/test_data/intermediate_ca_key.pem
index 2d3ea6981207..f6180b1b355a 100644
--- a/test/common/tls/ocsp/test_data/intermediate_ca_key.pem
+++ b/test/common/tls/ocsp/test_data/intermediate_ca_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/common/tls/ocsp/test_data/multiple_cert_ocsp_req.der b/test/common/tls/ocsp/test_data/multiple_cert_ocsp_req.der
index 3bb3bc154b9f..44f920a2407e 100644
Binary files a/test/common/tls/ocsp/test_data/multiple_cert_ocsp_req.der and b/test/common/tls/ocsp/test_data/multiple_cert_ocsp_req.der differ
diff --git a/test/common/tls/ocsp/test_data/multiple_cert_ocsp_resp.der b/test/common/tls/ocsp/test_data/multiple_cert_ocsp_resp.der
index c438e88bd843..d80ff0c4db1c 100644
Binary files a/test/common/tls/ocsp/test_data/multiple_cert_ocsp_resp.der and b/test/common/tls/ocsp/test_data/multiple_cert_ocsp_resp.der differ
diff --git a/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_req.der b/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_req.der
index ca0ef64bcba9..ae975db16261 100644
Binary files a/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_req.der and b/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_req.der differ
diff --git a/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der b/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der
index 140aee6b097c..937ec728143a 100644
Binary files a/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der and b/test/common/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der differ
diff --git a/test/common/tls/ocsp/test_data/revoked_cert.pem b/test/common/tls/ocsp/test_data/revoked_cert.pem
index ceea50537e7c..c2713e57de2c 100644
--- a/test/common/tls/ocsp/test_data/revoked_cert.pem
+++ b/test/common/tls/ocsp/test_data/revoked_cert.pem
@@ -2,20 +2,20 @@
 MIIDYDCCAkigAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTAL
 BgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxCzAJBgNVBAMM
-AmNhMB4XDTIyMTAyMzAyMjQzMFoXDTI0MTAyMjAyMjQzMFowXjELMAkGA1UEBhMC
+AmNhMB4XDTI0MTAyMjE0NTAzMFoXDTI2MTAyMjE0NTAzMFowXjELMAkGA1UEBhMC
 VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
 EEx5ZnQgRW5naW5lZXJpbmcxEDAOBgNVBAMMB3Jldm9rZWQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC85vP2qxNRY5z7pA9UX9QxSrDQ53EBATflTP2x
-Xx1Lg8fbE3j0cCp9u3rwl5SJ3L0zHj+rycq4f1p/0Qu4wEfDbTdCPyrtVatTzSKO
-c7xarjEvfKcPYM+agi6viUZeoASLexlAMtQXgotj2yDmia8JEo/H39PJYWwGr7sl
-+zCPHN+dMhR5hI5UBTTkQTIPONL0Goe1X7CmzKN21L6qf5RcbeskPYnlFNTBqAXl
-l3tWU4cgGkT1ceVPpthDtYTexLq7L5a7Haeu4GQUxkA4CQWwXDoQP8sBJIPc+i7M
-1bMf2nzIhCGt+aWxA85Pkw9tm9PyQlkq18H0GuIbkzmauyO3AgMBAAGjFTATMBEG
-CCsGAQUFBwEYBAUwAwIBBTANBgkqhkiG9w0BAQsFAAOCAQEAX9Xmum4fn6AapG1e
-QFwbOvgOG5PNBd1SiyzJKRf8nViPTDkUwC+dv4qTgNMgH7yS2DBH/0SlOxopFmOd
-oEoT3RwS9LHjuH7aIj/fmx0lXEjZp/9HpQqqPW0X/wlRG5xdEHFKHkSkpXYwBc9l
-s7gWDB4acszW9Zyj+cE9BG8eiPCal/geXMpBqyxLJKore+i71oUk60xohTdpWoz5
-kHwFcl6FixW9Jr7AEVaM7EIFF9hf7Q9aLMvELpP3HbO6oqJawT7Cc8kdfblfQrtI
-sxxohY69HhM8aglB/cgb3562pEKzyJmC1f6Ni6KM/N1SKn63M3zqZW2gd6G1W90D
-lJ+yBw==
+DQEBAQUAA4IBDwAwggEKAoIBAQDJoIzfrbWrwZPLiOLyTh+KsMl7z2uygZSx2kwc
+tUyqim6da4lUniCMSYc8GggKywihTjsMI+DXy9dbYyxVYTWHc2igl5K850C9ftsx
+R6HL3dC+ExWs/p7gS94AzmZia/dyVQfWIKwSZDsGoltwjHXwJWP08+EkO/UE2REb
+NglgfTJ0MmoYBaxpkO1QdgF/nKTEjG5vezFEtNckqJaII2RXf0keefPA37eT/bPU
+MzCOvp4j8Kxf7Df+hnXG7GPMwIaByaKCNB09+hfWvczZb/t8K69PY7UgvB2Ercxv
+8bXxjUaDx/HucnalDyAXGa1h1VHGHmyDROFMX2T+trrRezO5AgMBAAGjFTATMBEG
+CCsGAQUFBwEYBAUwAwIBBTANBgkqhkiG9w0BAQsFAAOCAQEAfbtiETsHs4aSBHiq
+AXnXxGyq40HYzwM1seWqbEGfz76v+r3CiPo6cTzvZFAKY5cM9v5in1W+lUj+ZZwi
+k/rEGNZ8sFXKQcfYj1sXfrdfdZUQfoOSSBupw6/hy/ZYZmPMVjk77rjuQj0Q30wL
+q4hB1wPr9a720b3b4adBKu+1G6F/pICpbauTc8axBhvZ1TGfQzXRlmYeRoGY9iLH
+b2du6TIRGF0U4l+kwjPxLt9PTQT29pPCcQe48iJ6romb2YDC4grdfUoeujCpQI2x
+jsTdbSbcHqhjt5p1fxgrBiAj6KWH+RACU2FbrYcUXY4RmN0f9Jn9ECno0I3TO6qX
+hognFQ==
 -----END CERTIFICATE-----
diff --git a/test/common/tls/ocsp/test_data/revoked_key.pem b/test/common/tls/ocsp/test_data/revoked_key.pem
index 9a9275c240d2..c678426bfcde 100644
--- a/test/common/tls/ocsp/test_data/revoked_key.pem
+++ b/test/common/tls/ocsp/test_data/revoked_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/common/tls/ocsp/test_data/revoked_ocsp_req.der b/test/common/tls/ocsp/test_data/revoked_ocsp_req.der
index 537232509bca..11897dafb21d 100644
Binary files a/test/common/tls/ocsp/test_data/revoked_ocsp_req.der and b/test/common/tls/ocsp/test_data/revoked_ocsp_req.der differ
diff --git a/test/common/tls/ocsp/test_data/revoked_ocsp_resp.der b/test/common/tls/ocsp/test_data/revoked_ocsp_resp.der
index 7b1f2ff1a45a..c10dabdfd1c2 100644
Binary files a/test/common/tls/ocsp/test_data/revoked_ocsp_resp.der and b/test/common/tls/ocsp/test_data/revoked_ocsp_resp.der differ
diff --git a/test/common/tls/ocsp/test_data/unknown_ocsp_req.der b/test/common/tls/ocsp/test_data/unknown_ocsp_req.der
index 5c3ca07b1309..9707e4649d89 100644
Binary files a/test/common/tls/ocsp/test_data/unknown_ocsp_req.der and b/test/common/tls/ocsp/test_data/unknown_ocsp_req.der differ
diff --git a/test/common/tls/ocsp/test_data/unknown_ocsp_resp.der b/test/common/tls/ocsp/test_data/unknown_ocsp_resp.der
index bba2aa702525..151dfe345e8c 100644
Binary files a/test/common/tls/ocsp/test_data/unknown_ocsp_resp.der and b/test/common/tls/ocsp/test_data/unknown_ocsp_resp.der differ