diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
index de0e6012ac0d1..cad4b993cd2f1 100755
--- a/ci/run_envoy_docker.sh
+++ b/ci/run_envoy_docker.sh
@@ -41,8 +41,9 @@ else
   BUILD_DIR_MOUNT_DEST=/build
   SOURCE_DIR="${PWD}"
   SOURCE_DIR_MOUNT_DEST=/source
-  START_COMMAND=("/bin/bash" "-lc" "groupadd --gid $(id -g) -f envoygroup \
-    && useradd -o --uid $(id -u) --gid $(id -g) --no-create-home --home-dir /build envoybuild \
+  DOCKER_GID="$(stat -c '%g' /var/run/docker.sock)"
+  START_COMMAND=("/bin/bash" "-lc" "groupadd --gid ${DOCKER_GID} -f envoygroup \
+    && useradd -o --uid $(id -u) --gid ${DOCKER_GID} --no-create-home --home-dir /build envoybuild \
     && usermod -a -G pcap envoybuild \
     && chown envoybuild:envoygroup /build \
     && sudo -EHs -u envoybuild bash -c 'cd /source && $*'")
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/ca_cert.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/ca_cert.pem
index d456c26f505f5..c5c98f7d178ea 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/ca_cert.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/ca_cert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID0zCCArugAwIBAgIUKtsec7QPrxG7JETQSPH7XVnH9RcwDQYJKoZIhvcNAQEL
+MIID0zCCArugAwIBAgIUGIR6NlZ17lyrZ5N9uK2g0QLW5TIwDQYJKoZIhvcNAQEL
 BQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIwMTAyMjAyNTc1MVoXDTIyMTAyMjAy
-NTc1MVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
+aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIyMTAyMzAyMjQyOVoXDTI0MTAyMjAy
+MjQyOVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
 BAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQg
 RW5naW5lZXJpbmcxCzAJBgNVBAMMAmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2+hzTr160c7mgNKCUoOxQylskIz2dAN5hWjBT38M8CGF5FcFZBG9
-QKSdt7QgnIBXt6oOAuOufKNLNWUKrzVE4GlDhxJKKCAlzidFaeIkk1Deny9kiADD
-dsVrOMHv6JXIMPcgotoOVu6iwGlYsvHr/OukbR4PAbjdzd51drC/aKIwRx4vc9Qk
-+WKtVXjJKQcsyxeEKfrOJloZOkorMf2HWWAOBNg7eBLsHeQiOrLPnwJf0eFfHzOC
-x2BM8hJ+fyHk+NmenjEl88XGaTkdpilmZXFqeDBCcrsLwbVPozO5sixkz4q7Uw9E
-gBKpjtCy1uR+mD01vH17X2kflmgVRkjqlQIDAQABo2MwYTAdBgNVHQ4EFgQUGHhD
-5J6kUeZrRjpHWi16WW54hBYwHwYDVR0jBBgwFoAUGHhD5J6kUeZrRjpHWi16WW54
-hBYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggEBALJ5R1bD5xPeX4vto8OAEeGWNh/OJkaEp8JOllnBlws4vYVRso436kXR
-2SUNXV23CC+8f03WiCkva7rLTBIa9Nwg/F118o5L279w+yh+gRZ0Z1s4ob+fbziI
-0sA/NUOmtdR2SE5YNeHdAtH6A1YajgixTNo20ipZv5CNBzN2bxBGh9b/4W3LLZ0h
-jgwOPUSVtcmFek525t7nkZaKB86P9g0VvM/gRJfG6y84wQZxueScv6elNUx+O9DG
-E5D1ku5EkfeeH4iL0eTd+VDfE1pGZC8OB75110WbPWU4V3la9wC+tQTkN9XFHDJT
-zx9HcnA2KjGZ6+8ZgjwjWCpUY+grDPc=
+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=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/ca_key.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/ca_key.pem
index 888feabbec1be..7ed25605fe607 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/ca_key.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/ca_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEowIBAAKCAQEAvXEqixfAmuBA47KSQuSJ4aQ1+o1VvwGMIPmy3oeYbj1Wvfs3
+6YOqON9tFtOzjM5u8gCkv/FQUnALMswi2F+l44f7i7KFb7iUxR5qCw2kVWCgyyqW
+RH/pMZue9HBFWYNpXNaryf26vOYmeKzlSgJuKA8RRuF4sAtPQ/OQmm5B/WntWZUW
+ZUNGCAO46wcKKEU0SiJD4HNjfu7yId2nZikXfXo5jjvqiXoeG/zVSOkn/B0IDEiT
+YX/AbUqIlDUdIDWg1xU27Rfzkc8Fy6x4f7of6ZT0YzYbaLEAShTNDRc0aaIBGzcj
+W1rRzBgOANy24wreP6Nh2HN3tvKWuHi/oDFaawIDAQABAoIBAAd3aVzYD9BK3GPd
+CuS2CzUoerQoU+PWVMaL8N/SalCV/FA6kYaTmObq72rB50a6cCb7nYKvKSJGpjpX
+T1xF0Mz59BEadSXlGX/3ZeiPnhV7XHsFb6y9edxprMcnkaQoiMOO9nBcnrqJO6Tv
+842KMPtFNMIdattNZs9fzyg3BkTNkaA472SmRsQ2Ld4kVQUqXjPW8dwF1dZ2pNI0
+dSTs33xcJMZWgUh3WMEsNmcq/wa35lqhCutdlPY2NV/TN/aahI9gaOMB78qfM/Kj
+ALk7jNL/KnqOx2wehmwRA4BNbIrx7B+kzpAlCFRnhVP8GBZ+Wx6xTd4Ls9qlVJ41
+zEPzZrkCgYEA3Ty6yRTyMrC4RgjBQBgBoXdXiFxMu5fA1F6QE4QtXbXDFncVU0Po
+5oQFAeGAAMkunfvIMH+1NpY23jZCawa038ApmO5lq7jh3Cwy2peXgx2i90PCbnDJ
+KvAu8WD1xdKXSyAogsG3IOb8TSseUBKhVQaALp9FDWPKJcpG73BicVcCgYEA2zV5
+tVIiJ87s4++h8fSS7H86XBOxIDFEMIJ1L9ffVvHfqNcyhYizfLh6sUXF5oI57bqI
+wZccqvaTqC7pTR/luw3nhw8qhT1sj59hf1uSGuiwIgTdbXMBQDtUNbtNQPaJkHYP
+GjZfKMYzd4r5KpirL1N1Z9Dcj441f1jLlYnujw0CgYEAjsLLfUpI57DlmDu6CFP1
+aW4LS/DTixHn2qKSsiVO6POLSgnZ9vsRZP64BHixEtC/hi6dBb7C/tB743R783hG
+a0QjE45yiRcql9rljezYVkFfkdNlucKJ7W1DvXrl3ZuBCXdc7NN4CoFDOcCjNORw
+ut8RBAS+mF9WaIBYudV5kM0CgYAYW17EqPWmmrVztkK2UcipgpGHfaCmxRKgmT5Q
+LJpiXMnPRuoUMFZRO2ZWoDwXGs04/wsHB7VlwbQycdP2f97U4/yf4y2EVIjlhH4e
+2pvnZYd8oDHCYY74Bh+bQM6as0ohxRx0eyojq7I4TDbXZtNOlOVsvaZkRRboqYMl
+gIgDWQKBgFDclJivadkWpQQhUiEPpaJi8W/10ir6CCx/R0pnfpCmURjcNP2aJ/ht
+eRTMx9EBQAUn+lKneigopuDhHlybJuhVe21owNx8lXKRxDT74guUySOLatbDkxtv
+Rzkl7t6YdqleudEAbmSBciBWhh1L+KuvmqQxrTScQJD2eWkBPTKu
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_cert.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_cert.pem
index 724ea898ea248..738a5a2627347 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_cert.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_cert.pem
@@ -2,15 +2,15 @@
 MIICdzCCAV8CAhACMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNVBAYTAlVTMRMwEQYD
 VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK
 DARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQswCQYDVQQDDAJjYTAe
-Fw0yMDEwMjIwMjU3NTNaFw0yMjEwMjIwMjU3NTNaMFwxCzAJBgNVBAYTAlVTMRMw
+Fw0yMjEwMjMwMjI0MzBaFw0yNDEwMjIwMjI0MzBaMFwxCzAJBgNVBAYTAlVTMRMw
 EQYDVQQIDApDYWxpZm9ybmlhMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0
 IEVuZ2luZWVyaW5nMQ4wDAYDVQQDDAVlY2RzYTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABBH5TFHZK1e7SPtmeTESrQD/Kce4uLKz+on7qlHOd2D4yNoI62TyXMq/
-o6660I5SJVIEIueDZdh/ocVezGYuUt8wDQYJKoZIhvcNAQELBQADggEBAD5jqxzW
-76B6WOLJlRTWpAKv2L7CdtRjV2inNvS7n+NOSQllP9IfHGM9qEHM7xvDymLZb/TR
-tOcpUENLJVOmRsjs90cy21Nc8ZkRFBhJOPggTTL3PpkM2sYmsSBzjDvkvqrH+hY3
-FTGAdgDaIf9gBeI61Ind/z6lqcE7yJlVtTvKVYPC0MFtzBS44I92x7g5htTzfEv7
-rO866GmsiG+b/w/d8TCHOt1L+gyk3BbAbBOI3DkZt/UtUpev8ZXKEjigcpxHy+Je
-BLDYq6S7RPPtkPk+z8Iz3HRmyykvrckU2kjcTdqY8KygCgFBZETIYsk5d1CJxGcV
-gDVhAiuki1Lwuzo=
+AwEHA0IABF9j5Nj82s+FE1VDPNJICcZOvWjaoV8TM6tQ4iCduJe42vIGprWVxcgn
+Twc7mzCiuZRbmXyugxTGfc9BJpY2qG0wDQYJKoZIhvcNAQELBQADggEBAGf5RI7m
+KahYnZSihIPkSv+jrkrSJExIwOjYkYQnFkH2QiplEU2n/2T2wyM8JsmslbJ96eL6
+rP5yspFywQFehgBvm02OI4HykpMCLcizTKrdKANTeKJb+8BoQFX5wlVpJ/Uc2pIs
+th2kWfNiTPhqO+CxheyT1V0QRTALz+e4WD7gBla9hxiVGzu5LY0TaoKWvgGUoQWy
+MDXmpyY4fgqV7levQ4i47DeR6Q0DKd50AwMMsm6ueI0JYWvqfSu8KmtdH9ae9c+C
+ll6yCwJvUvaAZ/0mxJvM+2eJmjvNZn8fIe4hSXKjmoFwgY4m3JE0waFX3BifDKGr
+i9kQQD4p6SeRjP4=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_key.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_key.pem
index 8fac462fe37b8..99a6e1f5b6949 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_key.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_key.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOShXROw7kmo0cMJgNQ8rdZfjceLh+KMocrzYIqphTYYoAoGCCqGSM49
-AwEHoUQDQgAEEflMUdkrV7tI+2Z5MRKtAP8px7i4srP6ifuqUc53YPjI2gjrZPJc
-yr+jrrrQjlIlUgQi54Nl2H+hxV7MZi5S3w==
+MHcCAQEEIGwYbBaoZMHNNam3qe/GTARZDtNO1VJv7h38q5N4Dt3JoAoGCCqGSM49
+AwEHoUQDQgAEX2Pk2Pzaz4UTVUM80kgJxk69aNqhXxMzq1DiIJ24l7ja8gamtZXF
+yCdPBzubMKK5lFuZfK6DFMZ9z0EmljaobQ==
 -----END EC PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_req.der b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_req.der
index 6769a837244d5..99bd3a19e3483 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_req.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_req.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_resp.der b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_resp.der
index 8bc4f54bfd7fb..fa41eee455f6c 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_resp.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/ecdsa_ocsp_resp.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/good_cert.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/good_cert.pem
index 4c25d638be7cc..e462b37b73ae3 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/good_cert.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/good_cert.pem
@@ -2,19 +2,19 @@
 MIIDQTCCAikCAhAAMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNVBAYTAlVTMRMwEQYD
 VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK
 DARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMQswCQYDVQQDDAJjYTAe
-Fw0yMDEwMjIwMjU3NTJaFw0yMjEwMjIwMjU3NTJaMFsxCzAJBgNVBAYTAlVTMRMw
+Fw0yMjEwMjMwMjI0MzBaFw0yNDEwMjIwMjI0MzBaMFsxCzAJBgNVBAYTAlVTMRMw
 EQYDVQQIDApDYWxpZm9ybmlhMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0
 IEVuZ2luZWVyaW5nMQ0wCwYDVQQDDARnb29kMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA5wzIeQ43mRZy7lfnZl2ELODYH7cXhuPLv/9v/om7WcB1vuT4
-cCyZph8Rr2jZucaD6i40JGABDzERWShUI19QelNtXPFTv4SkNtJK+ONevMuyx8gO
-fXOSfVXtg9fUKCSN5oLEj3+EKu+zmjyZ4xBTrXa+yaiTc7859WCZ+wlGCP0XSymX
-qYnc95U4PXLGD009TbKtL2SAs7v+00Ohbq1iybeKFWn2TCQryNkc5X7MJZ2io8pL
-MQqbhHuGVZTbRgoYFZ8gh8F1q4Ldfn84K3BEHy+pXMrC9mbYeNNpqDzo9dOrisQy
-BVyyZmJK3KGxW7exNJYVtXOQh0pfGny4cjbGowIDAQABMA0GCSqGSIb3DQEBCwUA
-A4IBAQBD2wITti7SV7hHMKjeB4vv9HrpYHe58LkthZWHAWfcV4usdQl8/R/pe6xp
-vbda1dPkDOL3h9DWXb3OtDxZszk/muQ2O3IMzkm3RdOYK4TxiyhRiilYI8nOHCNS
-/nzl2TGdoaHMYNKDopJaSuWo78ojcI6y/xJHSJFFHTazHrcLZsoanqYNUh352E1U
-j7x8b0h6KB2ODeUa2z8g4sMqTexSDDKz4ND9vfoSPn02mG/3RuVsIxX5F1LNCP5W
-RfxRA4uDR3/FSmWAHRPDpdh1NfNDZyh1yXlEyJS2XhuKUCDfCMqHYrxOfgQs6f+2
-d1z/R2EV8f4bBFxyL0nfOuo2J4+u
+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
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/good_key.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/good_key.pem
index 5a6e6a2a14638..fabd2e9546cb1 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/good_key.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/good_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA5wzIeQ43mRZy7lfnZl2ELODYH7cXhuPLv/9v/om7WcB1vuT4
-cCyZph8Rr2jZucaD6i40JGABDzERWShUI19QelNtXPFTv4SkNtJK+ONevMuyx8gO
-fXOSfVXtg9fUKCSN5oLEj3+EKu+zmjyZ4xBTrXa+yaiTc7859WCZ+wlGCP0XSymX
-qYnc95U4PXLGD009TbKtL2SAs7v+00Ohbq1iybeKFWn2TCQryNkc5X7MJZ2io8pL
-MQqbhHuGVZTbRgoYFZ8gh8F1q4Ldfn84K3BEHy+pXMrC9mbYeNNpqDzo9dOrisQy
-BVyyZmJK3KGxW7exNJYVtXOQh0pfGny4cjbGowIDAQABAoIBAQCqpOtPVSvE+iqK
-VAwIs5rSVoHo8p4Cty2dsTfzA6CGijmscon2t0oHwjyak9LyfWaiR9uk3e8KXFAW
-zE1QDq5umj1Ufrw+3+U0xB4xMiSfRcbV/LCPARO5VARm8rmzqEPRctVfsmtYFs9M
-Y+O4Ky/SFriUUdgNjbdtvhobqV67dWIxATeYET0ayACgeJITcfH4XaAdQt5LJbDI
-qemCu3hvvc4qqk0Ad/nqCl+B0D8/zWuyX5bKnNw+1g868VCFskdGiM7uZTZIXBja
-6N3VBv6dENebcX+j9t+RxtOIRMm5ndFGzAq50ylKKiw5M/hRHxgHb0l7OF1Ud2Jw
-QSumpj8pAoGBAPh6VgAvEHRECDHUs+RscNcrhTTJF/A787rx/7kJMHxVMlr3GPvv
-clxhK7GquFEpYlB6+R+otWvfowq7F+sEGutepfgI0vp0QriwziVQw1xg4lnfK4TR
-uKLmL/wQGEIMi4G2n8RacYGSGGl39mmRchCEeYWHV+P0j7ss7SkJ3WNVAoGBAO4L
-YiV1TBpmD+3cWZh0BEvjYQePmFoLdFypd/tOZYL9jhtiCIV7uDPUwTe8UCPrLpUi
-XPHp9Sfhoo0gLGQVxHowHaDQBUnzo+LzdMPu8YlJv1okH0rkdwQ355yAVgTVz3sv
-XTJtVGnSLmA/BthLMrFJfn5Sbus/c3vNgw7Cu3IXAoGAPSEDpVnux1uxVGkKtKiE
-/jqDs9/BFuX46UX97oy3M+9VyxE9QUXAMb/qGvRwEe+Hc1s9jK9ZqqdDGjG7CaNh
-6APJ+wJYvSr6+yrsHDwJQ+HF7ew8bZmWveS5a16eSSmC7K98ELdbc0/414Geyovw
-ruWYa+RHGBqjfZ3o3o7Bu10CgYEAt9GyiJp7micWRefSiBeO+cssMlqAm4gc4zE6
-paV0XiLOifa5/dn79IpmalPQzuvdnOxcObMgzRtAGxqtLNxiTLi7KGN6shCija7S
-jDsH6aw5R7J9N6gU//zrrb6sri8teUKqBTbH6K+VgF0rO/tVufG27HVbke39j6yz
-d8KIXSECgYB3JaYxWdoxptUvpqITvIBRNEfhNVrxzdGz95EcS6RqmG7UxJlTN2Yk
-LKZ9pIOD43QQ3i5D2cF6XN4BCSZ+wRVzOt43RP8DUMgbLzLf8h9N/6cQGEbFqtlb
-9x5wTSPF7VRJY+ToSnnBWyFRPLkwm9u1VpeBIUa3bGDDbV/SdJIeUg==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_req.der b/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_req.der
index f5d7e4150fe3b..cc13804ae218b 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_req.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_req.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_resp.der b/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_resp.der
index c2478b1632608..6a7d307b5fb6f 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_resp.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_resp.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_resp_details.txt b/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_resp_details.txt
index ecf8355ace5b7..4afb6c4c591ef 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/good_ocsp_resp_details.txt
+++ b/test/extensions/transport_sockets/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 22 02:57:52 2020 GMT
+    Produced At: Oct 23 02:24:30 2022 GMT
     Responses:
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 16C50680A809B68F302789AB234F8F4B30B0E06C
-      Issuer Key Hash: 187843E49EA451E66B463A475A2D7A596E788416
+      Issuer Key Hash: 9CCC1F8D90A0EE92DE24E81860493FBEC3D55689
       Serial Number: 1000
     Cert Status: good
-    This Update: Oct 22 02:57:52 2020 GMT
-    Next Update: Oct 22 02:57:52 2022 GMT
+    This Update: Oct 23 02:24:30 2022 GMT
+    Next Update: Oct 22 02:24:30 2024 GMT
 
     Response Extensions:
         OCSP Nonce:
-            04109C5C7305A9C99B599CAD3612F1A32885
+            0410A6DB264F79FBA79B5B4B41EFB5386AFE
     Signature Algorithm: sha256WithRSAEncryption
-         b6:2f:7e:dd:b5:eb:5b:e6:e6:1f:d4:fb:7f:59:35:de:b2:31:
-         2a:52:4a:7d:81:8a:ec:7d:dc:cc:7a:92:61:7d:f1:02:25:c9:
-         2c:ed:ea:ec:14:c1:a8:8f:78:44:01:4a:e6:07:ff:fc:61:0e:
-         3b:ba:66:d6:c5:6b:6d:77:7c:ef:ea:a6:b6:75:87:14:34:b1:
-         75:02:ef:7d:6e:a3:5d:5b:29:e2:60:4e:39:ae:ce:1a:5f:ef:
-         35:9f:ce:d5:e1:0f:f9:f4:51:2d:07:f8:38:4c:5c:96:ba:60:
-         66:07:e0:7a:ea:ac:ba:70:ea:1a:8f:bf:b9:26:94:a9:83:13:
-         17:70:61:f7:38:4e:06:73:1a:3d:b3:02:4b:19:82:a3:4a:e1:
-         7c:07:d8:fd:b7:91:56:16:25:86:e9:a8:ff:a5:c2:cb:6e:c8:
-         ee:b1:da:77:2d:6a:e9:7e:a5:48:54:f4:1f:82:0e:b3:72:0c:
-         53:03:95:a3:b0:3c:4e:55:74:ee:96:d6:f7:b2:03:1b:7f:24:
-         61:e1:dc:ed:d6:a3:0d:13:02:82:0d:ed:bd:ed:ba:ab:2e:8c:
-         d0:19:f6:c9:8e:59:ad:68:ea:34:6f:33:5d:96:73:b3:3e:df:
-         a0:10:d6:ac:18:f6:ab:12:fe:9d:35:41:0d:34:4f:da:70:c3:
-         4e:7d:52:46
+         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
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            2a:db:1e:73:b4:0f:af:11:bb:24:44:d0:48:f1:fb:5d:59:c7:f5:17
+            18:84:7a:36:56:75:ee:5c:ab:67:93:7d:b8:ad:a0:d1:02:d6:e5:32
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, L=San Francisco, O=Lyft, OU=Lyft Engineering, CN=ca
         Validity
-            Not Before: Oct 22 02:57:51 2020 GMT
-            Not After : Oct 22 02:57:51 2022 GMT
+            Not Before: Oct 23 02:24:29 2022 GMT
+            Not After : Oct 22 02:24:29 2024 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)
                 Modulus:
-                    00:db:e8:73:4e:bd:7a:d1:ce:e6:80:d2:82:52:83:
-                    b1:43:29:6c:90:8c:f6:74:03:79:85:68:c1:4f:7f:
-                    0c:f0:21:85:e4:57:05:64:11:bd:40:a4:9d:b7:b4:
-                    20:9c:80:57:b7:aa:0e:02:e3:ae:7c:a3:4b:35:65:
-                    0a:af:35:44:e0:69:43:87:12:4a:28:20:25:ce:27:
-                    45:69:e2:24:93:50:de:9f:2f:64:88:00:c3:76:c5:
-                    6b:38:c1:ef:e8:95:c8:30:f7:20:a2:da:0e:56:ee:
-                    a2:c0:69:58:b2:f1:eb:fc:eb:a4:6d:1e:0f:01:b8:
-                    dd:cd:de:75:76:b0:bf:68:a2:30:47:1e:2f:73:d4:
-                    24:f9:62:ad:55:78:c9:29:07:2c:cb:17:84:29:fa:
-                    ce:26:5a:19:3a:4a:2b:31:fd:87:59:60:0e:04:d8:
-                    3b:78:12:ec:1d:e4:22:3a:b2:cf:9f:02:5f:d1:e1:
-                    5f:1f:33:82:c7:60:4c:f2:12:7e:7f:21:e4:f8:d9:
-                    9e:9e:31:25:f3:c5:c6:69:39:1d:a6:29:66:65:71:
-                    6a:78:30:42:72:bb:0b:c1:b5:4f:a3:33:b9:b2:2c:
-                    64:cf:8a:bb:53:0f:44:80:12:a9:8e:d0:b2:d6:e4:
-                    7e:98:3d:35:bc:7d:7b:5f:69:1f:96:68:15:46:48:
-                    ea:95
+                    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
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier:
-                18:78:43:E4:9E:A4:51:E6:6B:46:3A:47:5A:2D:7A:59:6E:78:84:16
+                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:18:78:43:E4:9E:A4:51:E6:6B:46:3A:47:5A:2D:7A:59:6E:78:84:16
+                keyid:9C:CC:1F:8D:90:A0:EE:92:DE:24:E8:18:60:49:3F:BE:C3:D5:56:89
 
             X509v3 Basic Constraints: critical
                 CA:TRUE
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
     Signature Algorithm: sha256WithRSAEncryption
-         b2:79:47:56:c3:e7:13:de:5f:8b:ed:a3:c3:80:11:e1:96:36:
-         1f:ce:26:46:84:a7:c2:4e:96:59:c1:97:0b:38:bd:85:51:b2:
-         8e:37:ea:45:d1:d9:25:0d:5d:5d:b7:08:2f:bc:7f:4d:d6:88:
-         29:2f:6b:ba:cb:4c:12:1a:f4:dc:20:fc:5d:75:f2:8e:4b:db:
-         bf:70:fb:28:7e:81:16:74:67:5b:38:a1:bf:9f:6f:38:88:d2:
-         c0:3f:35:43:a6:b5:d4:76:48:4e:58:35:e1:dd:02:d1:fa:03:
-         56:1a:8e:08:b1:4c:da:36:d2:2a:59:bf:90:8d:07:33:76:6f:
-         10:46:87:d6:ff:e1:6d:cb:2d:9d:21:8e:0c:0e:3d:44:95:b5:
-         c9:85:7a:4e:76:e6:de:e7:91:96:8a:07:ce:8f:f6:0d:15:bc:
-         cf:e0:44:97:c6:eb:2f:38:c1:06:71:b9:e4:9c:bf:a7:a5:35:
-         4c:7e:3b:d0:c6:13:90:f5:92:ee:44:91:f7:9e:1f:88:8b:d1:
-         e4:dd:f9:50:df:13:5a:46:64:2f:0e:07:be:75:d7:45:9b:3d:
-         65:38:57:79:5a:f7:00:be:b5:04:e4:37:d5:c5:1c:32:53:cf:
-         1f:47:72:70:36:2a:31:99:eb:ef:19:82:3c:23:58:2a:54:63:
-         e8:2b:0c:f7
+         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
 -----BEGIN CERTIFICATE-----
-MIID0zCCArugAwIBAgIUKtsec7QPrxG7JETQSPH7XVnH9RcwDQYJKoZIhvcNAQEL
+MIID0zCCArugAwIBAgIUGIR6NlZ17lyrZ5N9uK2g0QLW5TIwDQYJKoZIhvcNAQEL
 BQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIwMTAyMjAyNTc1MVoXDTIyMTAyMjAy
-NTc1MVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
+aW5lZXJpbmcxCzAJBgNVBAMMAmNhMB4XDTIyMTAyMzAyMjQyOVoXDTI0MTAyMjAy
+MjQyOVowcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
 BAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQg
 RW5naW5lZXJpbmcxCzAJBgNVBAMMAmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2+hzTr160c7mgNKCUoOxQylskIz2dAN5hWjBT38M8CGF5FcFZBG9
-QKSdt7QgnIBXt6oOAuOufKNLNWUKrzVE4GlDhxJKKCAlzidFaeIkk1Deny9kiADD
-dsVrOMHv6JXIMPcgotoOVu6iwGlYsvHr/OukbR4PAbjdzd51drC/aKIwRx4vc9Qk
-+WKtVXjJKQcsyxeEKfrOJloZOkorMf2HWWAOBNg7eBLsHeQiOrLPnwJf0eFfHzOC
-x2BM8hJ+fyHk+NmenjEl88XGaTkdpilmZXFqeDBCcrsLwbVPozO5sixkz4q7Uw9E
-gBKpjtCy1uR+mD01vH17X2kflmgVRkjqlQIDAQABo2MwYTAdBgNVHQ4EFgQUGHhD
-5J6kUeZrRjpHWi16WW54hBYwHwYDVR0jBBgwFoAUGHhD5J6kUeZrRjpHWi16WW54
-hBYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggEBALJ5R1bD5xPeX4vto8OAEeGWNh/OJkaEp8JOllnBlws4vYVRso436kXR
-2SUNXV23CC+8f03WiCkva7rLTBIa9Nwg/F118o5L279w+yh+gRZ0Z1s4ob+fbziI
-0sA/NUOmtdR2SE5YNeHdAtH6A1YajgixTNo20ipZv5CNBzN2bxBGh9b/4W3LLZ0h
-jgwOPUSVtcmFek525t7nkZaKB86P9g0VvM/gRJfG6y84wQZxueScv6elNUx+O9DG
-E5D1ku5EkfeeH4iL0eTd+VDfE1pGZC8OB75110WbPWU4V3la9wC+tQTkN9XFHDJT
-zx9HcnA2KjGZ6+8ZgjwjWCpUY+grDPc=
+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=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/intermediate_ca_cert.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/intermediate_ca_cert.pem
index f9f104f8d05c7..5eefdf36969eb 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/intermediate_ca_cert.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/intermediate_ca_cert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/intermediate_ca_key.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/intermediate_ca_key.pem
index f8347a1701365..2d3ea69812071 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/intermediate_ca_key.pem
+++ b/test/extensions/transport_sockets/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/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_req.der b/test/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_req.der
index 02da216fd77a3..3bb3bc154b9ff 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_req.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_req.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_resp.der b/test/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_resp.der
index e6af4d98fe865..c438e88bd843c 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_resp.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/multiple_cert_ocsp_resp.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_req.der b/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_req.der
index 71d48a2acc5a0..ca0ef64bcba93 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_req.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_req.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der b/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der
index dec1446b6ee7f..140aee6b097c3 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/responder_key_hash_ocsp_resp.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_cert.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_cert.pem
index 58e8b6ca6aa56..ceea50537e7c7 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_cert.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_cert.pem
@@ -2,20 +2,20 @@
 MIIDYDCCAkigAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCVVMx
 EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTAL
 BgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxCzAJBgNVBAMM
-AmNhMB4XDTIwMTAyMjAyNTc1MloXDTIyMTAyMjAyNTc1MlowXjELMAkGA1UEBhMC
+AmNhMB4XDTIyMTAyMzAyMjQzMFoXDTI0MTAyMjAyMjQzMFowXjELMAkGA1UEBhMC
 VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
 EEx5ZnQgRW5naW5lZXJpbmcxEDAOBgNVBAMMB3Jldm9rZWQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCxmvUb+/sG/GYQNdpaCWP4cmMun5RPmc4s+tLI
-1XutvZxouwo7HNBPq95SAO4FkzwBLJ19r8D9Tn/1zHxVgTC3r9JymlpMQphQDPTu
-qiJhq2gkB6SXMhOYPnXMWiX0qbzdQZtuUl63qhWsQHYvjilyLSp0+qAIeRlm7hGG
-amxVrtbWzB2BR1zwZN4ysyMTDslUD1/UfBFLYUO05RCiu4dhYRLwCDcmTuM5ROt7
-lmYmI2HbCwbc2I3OMuDx5MsLzc3/lzUdwfii6IYCYSep0uNC2KstjVp4pnOaF9S1
-r2hVpuFBN7CJDrucbGup06wOcbCzGY3+KcvL2jV2pi1TOK4tAgMBAAGjFTATMBEG
-CCsGAQUFBwEYBAUwAwIBBTANBgkqhkiG9w0BAQsFAAOCAQEAyKdZ7vxkP0ipl94h
-0E+etmeY7GpcyJtlcSRrBUUbQLlpieuICDVpVYPUHajcGYp4crkxL/5lAUsTlUIM
-LvquncT16JBEMz5baV8Q4A+csCd9OoJ0FaZV4E5IRW63WckBlUcZtEDKYh5jHxeb
-OaH6NG0br8a+avj0a0oow6VA03j2Kv11Bqvz2tSxWvYl7BLKviP0EDUhmL5xz3sU
-md0u5IdE4iCGdcysBbqYT9OuwKvHmaIBfbN6J/gNItZcxu6cuLxEvK6Df8Gao50b
-xrMoBp6P6B3Vwge/IjYev83LzxoTNb1X5MTPE9myf+TkmQP2FYU18CPWsyW34pDf
-zTm2kg==
+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==
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_key.pem b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_key.pem
index 0e9c699b2a84b..9a9275c240d22 100644
--- a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_key.pem
+++ b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEAvObz9qsTUWOc+6QPVF/UMUqw0OdxAQE35Uz9sV8dS4PH2xN4
+9HAqfbt68JeUidy9Mx4/q8nKuH9af9ELuMBHw203Qj8q7VWrU80ijnO8Wq4xL3yn
+D2DPmoIur4lGXqAEi3sZQDLUF4KLY9sg5omvCRKPx9/TyWFsBq+7JfswjxzfnTIU
+eYSOVAU05EEyDzjS9BqHtV+wpsyjdtS+qn+UXG3rJD2J5RTUwagF5Zd7VlOHIBpE
+9XHlT6bYQ7WE3sS6uy+Wux2nruBkFMZAOAkFsFw6ED/LASSD3PouzNWzH9p8yIQh
+rfmlsQPOT5MPbZvT8kJZKtfB9BriG5M5mrsjtwIDAQABAoIBAQC3SkkR4PD/me4q
+ZQfS0KDtqxFhwg/t76aywT+vqSCdsyJqubw1QdiY4x7o78ta8WpLfWA+abBf0IKZ
+XtdGzptTTle92djnLKbuyy5qlnX+buKetw7KZx9JRmPSQxqamh2O0USw/CC7Jxnl
+LCwCRTonTXFheRbgYb0Vx9GJiu+VC7puIyhQ9d80usxgH0U1SImfVbxh6qaSoIUb
+biZrF1j7oNL8p4oz3aw2U/ZLeWYCzZAh2bLgukU4M++RABY1tUCuCOAbpqh1VBIV
+gVQoT4diqVcMy6VrDCtdHrmkZ80kpnFfdfGkOuAF2uNbeuy1wDgPW29vBqyzaAAM
+VT6tqNjxAoGBAPu3jw9A2aWH6JcgLCD/dApKBtlllNtoWkfFxLRt0dPcyd92n9ac
+XAQXr6dujfhbNsq1Klk6FbpHSA/6BwTTu78cOdBxu6oS2wQ1ze0q/kgQcqTDi4Ko
+2YtVwZ7XWKHIJ74i2gKgbO0ScP5ZANAwHrKvzlvcK5fUlh1A+5u1mhhFAoGBAMAd
+yDmUjz5Tqw1lvDx7Rj/mlkt2veBC60MDhZoKkx31GRjWKWI9P7ogqGgAFZdRgeZ9
+VfKQ4iFovjXsI8hc/HorpaknZur0OVNeWz9btQhqPugumshKLhqvlUoREURW5xyy
+sdq8DK0Fr7h/1275rLUcyjHPT+su/74xofeP1SHLAoGBAOhlybwgeJF+kDxvJK72
+itExFW/DfJKxnqCjNAANYGuFbhBVui7vP3k70R35UTQaKtUuPEITAZpxU1QE2FQZ
+lD5Wtf3/826LaBBUCKLOTeSE4wPB0l04vVkKPPAFDDyZyi+eh79jFA4xN4ds7vZH
+ZyA8dn6TIOBWEp5Br8tL+FAtAoGARxP9u0f6g03DUG6eaSYWxJeUbZEeCPXZQu7v
+pCFbcs72nRjHMOCGTl+8ztWRJ23xiIxAm0D9WOz+ysZ2KrA0fSLe5Kl+S1lWSED1
+s4hDfzyHz7FGdOn1CsyBiGiuIcGhOh3m7Y17hxw+eh1aYGWhf1SKfkk8QUAfQIfu
+a8BcU2cCgYB1LwHI15LkXiTnzNlMWvB+KvIzjmUlJwbJye3gcxHVq/yqt4pAJFkC
+MBXGrL5Kn6780aO1v2GlM6weUNv7EIerBbaL0TjAwU/TxMiU3MXbD3k2xIctCLFX
+fn1kt2pcbuNg8AP1jgoJD60svknnDt8/sDAAvhYQb9UPKTE55svj2g==
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_req.der b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_req.der
index b733ba5b845b8..537232509bcae 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_req.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_req.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_resp.der b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_resp.der
index 92a875f0c4913..7b1f2ff1a45ae 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_resp.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/revoked_ocsp_resp.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_req.der b/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_req.der
index a81d57b98f99b..5c3ca07b13091 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_req.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_req.der differ
diff --git a/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_resp.der b/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_resp.der
index e3ebdc126fcc5..bba2aa7025251 100644
Binary files a/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_resp.der and b/test/extensions/transport_sockets/tls/ocsp/test_data/unknown_ocsp_resp.der differ