diff --git a/test/core/tsi/test_creds/crl_data/8e36c2fd.0 b/test/core/tsi/test_creds/crl_data/15e5c67a.0
similarity index 100%
rename from test/core/tsi/test_creds/crl_data/8e36c2fd.0
rename to test/core/tsi/test_creds/crl_data/15e5c67a.0
diff --git a/test/core/tsi/test_creds/crl_data/baf02741.0 b/test/core/tsi/test_creds/crl_data/26fefe27.0
similarity index 100%
rename from test/core/tsi/test_creds/crl_data/baf02741.0
rename to test/core/tsi/test_creds/crl_data/26fefe27.0
diff --git a/test/core/tsi/test_creds/crl_data/README b/test/core/tsi/test_creds/crl_data/README
index 746d5635ea5..708e74af3c2 100644
--- a/test/core/tsi/test_creds/crl_data/README
+++ b/test/core/tsi/test_creds/crl_data/README
@@ -34,7 +34,7 @@ common name which is set to revoked.
 $ openssl x509 -req -CA ca.pem -CAkey ca.key -CAcreateserial -in revoked.csr \
   -out revoked.pem -days 3650
 
-$ openssl ca -revoke revoked.pem -keyfile ca.key -cert ca.pem -days 3650
+$ openssl ca -revoke revoked.pem -keyfile ca.key -cert ca.pem -config ca-openssl.cnf
 
 Generate the CRL file:
 ----------------------------------------------------------------------------
diff --git a/test/core/tsi/test_creds/crl_data/ca.key b/test/core/tsi/test_creds/crl_data/ca.key
index a057b1c9edc..853f98de794 100644
--- a/test/core/tsi/test_creds/crl_data/ca.key
+++ b/test/core/tsi/test_creds/crl_data/ca.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBvBuDa9j0HAcq
-VkdAQ6xP4Ucg0q6xsY/dRHow/HqvPxvcabYNUAD457RP8M8zyQqB/fABZrBjVyYu
-RIhkkuUIGQGqx/0vKiJQFrgDXU7YcH8/z7SN7FNtWhKy8xYG3SEge5dxQtq79fIG
-0UYxS0wRSuHH8xwXHDExxSomKaWBl2occbmKQwCCpJY27j1fH0zQWr0nwRKjHhfJ
-Zxa7ZVYBpRP5SvAUwJwKlHSIpxUKLgtpT4El3FN6wbgguEAHe1BcRqyHBBmvUq9F
-kAGnbcBjxeW2C8WGVWzq1Sj9YPWPQ/JspARBhF3nycirZRp+3WANa9u35rPdsp78
-rBHlGeLHAgMBAAECggEATliK69fGUdmv0CA6CjQTz+3zfMOWoAeFfV6+52aDGrGz
-y6v4UmPjMMVK9vUUZgXMOQt/bqGffVz19MoEOl/pPSAXu3/K1LL+U1MMsVeflgnQ
-e/a8NpS2nEdLvpBtfPMZ/W/dq5D0sgRhDv68mxyvM2ML8XdQCcx93Hm2dN5srv3f
-SrK0WIouxcXBvAhhaSZqUpCbOFAiSvcg+6XJ3RMxe02QZ8BM5Mqec7T9nUXsLxks
-PVcmz03mF/gvJN0kvp526S9XBlqTptrbPuI3/H2Yl2PD3wHrFcOu67U4WOoR/Wee
-PHjs7DJWxk0uLCDAVLK7aK21sOTKJkEZNpoR2jXauQKBgQDnd967KGfzucrrmHB1
-WmQP42wIywJ7ahiypTDdBpK0G0h+V7hiz6KzJzwVr2vcExpIBjaa3WCYfKdjb67T
-dk8itMu1GkHUGdoeT+uh9nuULUWHIqwNbiWMvuJNBObdpuTVmh8/kW06EWWpj+Hk
-yxo6LIQ0vFfZzReAcX5rMQ5zdQKBgQDWRHbgBVCK3h1pa8TyVyBz+8704J6JDTZP
-aQRg6ikqIS01YgvT2/EMthFfJTwso8MupgNUM43xqlgyi6cRQCEQpplS19/goWoi
-Ye//YZvRYwSD/QANfFFAZMhUMsuvsGjQYL2IODTcpHGBNEUgCDZ6kTIBgO3DdjMr
-1nXFzbFhywKBgBjZqbP2NpLYE40PpKM0vSFnjSW0heOyFEy5p3FTT1S+yR2nVUhm
-elU5lR3O44mRE3VAFYSy17gHSgFG8EILpZtYRbZ/xyl6TQyMEAQnbkUORzSm6EnY
-1Xcy1yDlsdOCI3c7QLeWaV+eloeJxvrFQ1+Tf+4ZemULu8YyaRwg/CgxAoGBAKLR
-6ed4AmlUOdNnQoTJMm8QdYbdvXr14ERd0Cb5KYjLJzh+pfA7HSSEohTEDcL6OpKT
-MspkVsPCpzzZpH3WVon5n181jfl7j1RLSf2tpaNqc/78XXLh+jhNnXFmHCQIkM1w
-Bfaih4D3MQ12s+SQeR2QgghkecjjZCU21c4W7WkbAoGBAMHUzJTauwVm/PUMMf0q
-BAz9kHHLxnMimmzK8AMofTNX3JvgqVct6Mvx/JTWH9f4QerlW8UgbrJKGz9E/LTD
-4Ba2tW8W3Y+ejxIkNUXcc+Cakm+s909H+FggU6LYBkPk3l4l+Z3JMZniadG+YuZw
-i0CSbkbygSwmqGpq0JHg6hs+
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVeuZVtfjw6RmH
+gSBxri+imN9XMC/2zrP6ZLeHVI8sTxNshDSfvtL50u41y0XK9WlAqpi+KTLHZv/v
+Oymt9G+QpoVccaW/Ui8/bgmi39Fg+vdsz2ZTmEu5N7gDLgWh1MWs6MNmUM43ZRlB
+v9A6pWYOTbHbv58aJdI1LmTLk+ZSqWmz9dvyaTF0q0i0gAdSQos/mJNDDIng6+zw
+sR0N5U0Zj6PtvVJ8XJT3csvYXaPvTn/nF8szQn+06n/CDodhvEd4cRNDwm+t4U/L
+0RrxfyZ9VmbdJ7dawtCJcJyLmU86pd3ENUgSKHjWft5azL1FLUoWAK7pH9sPPeFk
+XX6En0RVAgMBAAECggEAd42SPOHh/hiswWQhJUjlSGvQd+V2lwN/a3TICzPh0nCe
+ciE/z05wnJPx75JdDaKORTbEv4oW8/DM188MMm03pYx8Fx9WMWT3LNCU+O/bNDKY
+KgmkRqB9l8aKeM1nPhAIfCMGeuA5/G/Tyyx+krlaBByixGv10BDqPfozXIcBb7yG
+eJqpoNKPmHN9+wn09S1ftk8TBNPHSwwAEb9asIr3JaB5FOAZEPiCW1vNYuZZxhTR
+ehkVFXBkR3BMa/pRtTyIkfhjmre4gq2onbdcBgpbEyNMb2x7yarJ89m+IWxbRRQW
+I3If0UnW5gKBXLdd/0hsrPwsWsBCeTmQefSws+6HKQKBgQDzJaxaGz+9KZdt0TsM
+XaaIBihGgby0EKuj4Ib0hV0Jr3BXv6UDJy6cVyjMd3830cAAjAoBfnxfmIQEmz4E
+8cc72CsKz4FWhrFXN+IBVhx1SkcCoRGb91/NcgZ0YbjoXs4ibVm6hvQW7zHMvdVX
+z7Zu4a+fmDxCzl3hhA6OZtNRfwKBgQDgw8OnSVCmwg0Zoc03yM2ybVPxmvF5qqyZ
+0pQe9ta/0XfK7A961f+ltQSXFPQm62M6IOCtvw8SrZcDxyOOpZgRl95tix+U0ZoN
+nn6UX3PtRcPFQNZDL+SAG8+lCZ7Nmxq2TnjDRSKbzEF7Bre8ksG6LKbtiT5YncFP
+qSQiWMFsKwKBgQCRuWx4fIhQ6NJ24MVQ/ffG4lnVGABusucLyo9XkW5XVawxCwzs
+vNj0nlA3aw7192HpcgS1LIeCC7hjwl8DO5y6wy3YxtCveP5kVXvAbUmVCjVQ4BPb
+tADY8pPnwIG/0sIcZAk4/5TfAfCI0uVAQZ8HCX/mWKkVKPWfKTRIKFxSJQKBgDCd
+RxFEw0P+TtUPcRKyxQLlsLVePQKCzuhKaq0z2IkOpmlmm4aHCM9vkrmW16QfX4vw
+Foid/YWdtD8l8GPnHzgW8A4jfEY0+6wcbuZqqulUIJ7mgjFwB21KFqRsq0NvW9y4
+plgd+PlXuYYBkvYfi/VXuRdBixGhtXEkdWNUbSmXAoGAVbeLCopMQ7SO1Cu5ETsN
+Pc2ei4W0qO3B5WMC58R+A3q4m9a8sxatNaBW9L+4ohlVQiFGFEsjKl07FvWuSR8l
+t4GWbULd5MW4QUuRDEcDr/cgsLdK6qWSyUoeHCoM317UXkhAufWTxXiS1ZZ4g9ZG
+2g3HdQmD+yjBtjnMqSBA6DE=
 -----END PRIVATE KEY-----
diff --git a/test/core/tsi/test_creds/crl_data/ca.pem b/test/core/tsi/test_creds/crl_data/ca.pem
index aa92a9594b7..2a707783db2 100644
--- a/test/core/tsi/test_creds/crl_data/ca.pem
+++ b/test/core/tsi/test_creds/crl_data/ca.pem
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIUKnHtxUGUlsyz9jW7POo/RqJKKTswDQYJKoZIhvcNAQEL
-BQAwVjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGdGVzdGNhMB4XDTIx
-MTIwMzIxMTY0NFoXDTMxMTIwMTIxMTY0NFowVjELMAkGA1UEBhMCQVUxEzARBgNV
-BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
-ZDEPMA0GA1UEAwwGdGVzdGNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwbwbg2vY9BwHKlZHQEOsT+FHINKusbGP3UR6MPx6rz8b3Gm2DVAA+Oe0T/DP
-M8kKgf3wAWawY1cmLkSIZJLlCBkBqsf9LyoiUBa4A11O2HB/P8+0jexTbVoSsvMW
-Bt0hIHuXcULau/XyBtFGMUtMEUrhx/McFxwxMcUqJimlgZdqHHG5ikMAgqSWNu49
-Xx9M0Fq9J8ESox4XyWcWu2VWAaUT+UrwFMCcCpR0iKcVCi4LaU+BJdxTesG4ILhA
-B3tQXEashwQZr1KvRZABp23AY8XltgvFhlVs6tUo/WD1j0PybKQEQYRd58nIq2Ua
-ft1gDWvbt+az3bKe/KwR5RnixwIDAQABoyAwHjAMBgNVHRMEBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEACUf+kW3Zs5KFpR+Qm3K2xn3C
-MP9ttNNmC4mFxen9YVSo/XQRoavp0P4WF/KYOCFFTZiSfYEf5lgtyprachsI5mGx
-O8lKPDRkH7Ao33LhL3xkz7fZEoBmGWare/FZDR/p06yiltFj7WceyXdR9htfcpiA
-bZH357kqCrC88M52HhyzFxRC6S8keGevSxE6a5oZGW5o8llTXVNaqY3n+i/qqRYN
-pD3ex4p7v0nmJHw2Al2EnFpmH9+loxBrbOo3waa/LcR2xMYWGRuLwbOHDDfcNQ5v
-IDi5fKICaZ63vvlJ/VBlIbsmpqu5zZT0L2FHM/AuCc5ZZi+TidIdXJSPxBqlKg==
+MIIDTzCCAjegAwIBAgIJANxWk51OgC+2MA0GCSqGSIb3DQEBCwUAMFYxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxDzANBgNVBAMMBnRlc3RjYTAeFw0yMTA5MjIwNTIzNTda
+Fw0zMTA5MjAwNTIzNTdaMFYxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0
+YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMM
+BnRlc3RjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANV65lW1+PDp
+GYeBIHGuL6KY31cwL/bOs/pkt4dUjyxPE2yENJ++0vnS7jXLRcr1aUCqmL4pMsdm
+/+87Ka30b5CmhVxxpb9SLz9uCaLf0WD692zPZlOYS7k3uAMuBaHUxazow2ZQzjdl
+GUG/0DqlZg5Nsdu/nxol0jUuZMuT5lKpabP12/JpMXSrSLSAB1JCiz+Yk0MMieDr
+7PCxHQ3lTRmPo+29UnxclPdyy9hdo+9Of+cXyzNCf7Tqf8IOh2G8R3hxE0PCb63h
+T8vRGvF/Jn1WZt0nt1rC0IlwnIuZTzql3cQ1SBIoeNZ+3lrMvUUtShYArukf2w89
+4WRdfoSfRFUCAwEAAaMgMB4wDAYDVR0TBAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQELBQADggEBALmcr+Xy7g6+HYL4US/YqD289Vi+9jbUbwZuVsfY
+J3mKdExL5cYtqDGA6WCRdjDnebpGnOP2Ui+Hb32Guh2Z0upnde32WurxkbwEUx1C
+TYwBpOqmL8PRg1J60MU+9l0TK/7y40JWLYEgKVN4wdhSjL916yH6jrsDDaRsR8eh
+xzyB8FEmOQ8UbNB0J8S6G1RS2LpFna1dbq/+TBx/6GgxU7MgaQpvYKaD45ZzVaA2
+6zsOZgSHCHMYRf1iG7AKeLGACNSAIk2xiqsE8sV/k8rohIbJCQT/fqRvgYCWCAMd
+/7YXQSi+M44wvyEw+jdHrBdn3BDwCd+tmikXkmbSIV9DqvI=
 -----END CERTIFICATE-----
diff --git a/test/core/tsi/test_creds/crl_data/current.crl b/test/core/tsi/test_creds/crl_data/current.crl
index 1085b3dd94e..ca658725405 100644
--- a/test/core/tsi/test_creds/crl_data/current.crl
+++ b/test/core/tsi/test_creds/crl_data/current.crl
@@ -1,12 +1,12 @@
 -----BEGIN X509 CRL-----
-MIIB2TCBwgIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJBVTETMBEGA1UE
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJBVTETMBEGA1UE
 CAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRk
-MQ8wDQYDVQQDDAZ0ZXN0Y2EXDTIxMTIwMzIxMTc0NVoXDTIyMDEwMjIxMTc0NVow
-JzAlAhRSILpknGPXIWdLvLVIY7DlId/IQRcNMjExMjAzMjExNzQwWqAPMA0wCwYD
-VR0UBAQCAhAAMA0GCSqGSIb3DQEBCwUAA4IBAQDA/YK2DVQbsueA8+rSkAKlu/rF
-ywH8khHYNiyu5Y0x/lXDRmiB3RdeLrzbm4bxuzxgQG/NTPIIZGH7oDZs7/y4Gb2d
-3MjnDemKnok5OUcKKeKrqE8GEn8VXaDNYoaL58Ge8WZc3+3/ZfIyz6HXjSZjSLu7
-PGEuK3lEz3+zUOAGjvs+SyHSDyM1GtCKp53ur8U9Z7b8+qkysqPYGfoxNdZSgaF7
-3V1fR3hU7JdLkewPp/7Igm8C9BOQbpQCX6GKNTFyO5reH6bXReKCAMWbkb6hN/bV
-Y0RYY5yZwVmemPyT1OUR1ic+bnMJLTWuSzrrkR6b2Z+p4zT+38vo8K2KjQgT
+MQ8wDQYDVQQDDAZ0ZXN0Y2EXDTIxMDkyMjA1MzYyMFoXDTIxMTAyMjA1MzYyMFow
+HDAaAgkAiySwBjJlVHwXDTIxMDkyMjA1MzYwMVqgDzANMAsGA1UdFAQEAgIQADAN
+BgkqhkiG9w0BAQsFAAOCAQEAUFDfTvhdTHaJgMVf2vCMlJRW1lB7ATjnIwirRBR4
+iQBFtGeUep2D+0ZsAICocrp840rYVxTpXbhuP1CDm8jLo7/ih9BPGps3KgJGiy5i
+k+riEeVXSWWBZl3vaZnzd0NR3pood9+Of5hK/n9DYUctzdcpyZQDiFsdtZ1Nu7qY
+a5iFFfG3jc5TdIj8RrWCQe8hfSOcl9bjgFh4bSGHg464YNK9D8Vi5IW6/YC9Y2HL
+j4snAtcWSleN15GjyQVnZw2uLYw+3QNgjBEdC4tnEktUEKlQIHbRbKV2Ol1pd5O+
+tAOrMJFe94iXzHdOgdeyIQvQo8aflOnQ4uiDYEIjOyOMKQ==
 -----END X509 CRL-----
diff --git a/test/core/tsi/test_creds/crl_data/demoCA/index.txt b/test/core/tsi/test_creds/crl_data/demoCA/index.txt
index d6a07abf944..e288b25b52e 100644
--- a/test/core/tsi/test_creds/crl_data/demoCA/index.txt
+++ b/test/core/tsi/test_creds/crl_data/demoCA/index.txt
@@ -1 +1 @@
-R	311201211735Z	211203211740Z	5220BA649C63D721674BBCB54863B0E521DFC841	unknown	/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=revoked
+R	310920052448Z	210922053601Z	8B24B0063265547C	unknown	/CN=revoked
diff --git a/test/core/tsi/test_creds/crl_data/demoCA/index.txt.attr.old b/test/core/tsi/test_creds/crl_data/demoCA/index.txt.attr.old
deleted file mode 100644
index 8f7e63a3475..00000000000
--- a/test/core/tsi/test_creds/crl_data/demoCA/index.txt.attr.old
+++ /dev/null
@@ -1 +0,0 @@
-unique_subject = yes
diff --git a/test/core/tsi/test_creds/crl_data/revoked.key b/test/core/tsi/test_creds/crl_data/revoked.key
index e05af801c9b..971c857ac14 100644
--- a/test/core/tsi/test_creds/crl_data/revoked.key
+++ b/test/core/tsi/test_creds/crl_data/revoked.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD2ySbOgmRK4lOB
-+hk4qOiMTW2UxT8FKu/9PoWgIVfkt1CSfK9h+zuAZQKKtW4KNvrfTj24bwQLAMVl
-kZkDY8R5UTgo3UJJihlvn/82HoeqSHWUHg5sJEsiuoZIFf1XmTuC+PnAQBezXIJR
-FS+oxpvgcGHNNyRsjN+ZAJfQNuSOtHH7TAwdurXJSi5OG3z1dxErvya+cgDh0GKz
-VyI39bR6upDDfQ3e75P3ydDjz4cOH/cWVrB60XEc6fauV9RLhjFiErpfrlYD+hoH
-Vjp6ugqbXUAhjsxygY/kbBmxTrW2Z+n9BplIDA8O5Tq7LCdahXSw1UElCuvrFiUR
-b3NpOCw1AgMBAAECggEBAOUi66c+pkRpVEQQpS5YlmL+2UoSwmrX7TBjxsphayxv
-kJ4Sqvz8uciDARMtVdiiJ9kC2ofOfCCDPMULpNji32ANK2m11oBVezyLf/kN68UN
-ti4qohWCtUivi1KPKEUXf4wiBDKez+K3eEA0vaWlksGXVxelpWosesejJ1IqRZjA
-23LVlvWnFqdDpcsVpWR3QTl78HhmL46D9cP4NGXeaxM3HU9AHeO4YcBUTBB8wI8b
-wh7jbRnoKW+g8TbxjWEnEamlYNVrEzeIGwr/ZXVTPD77+hOCKQjv/iwsPgH6LSAG
-eSr1/Oz/P4Tn61ariOg4Vlr49w1gTnWNpek4+7ki7YECgYEA/izwhFZIC5tpZxeq
-D58r8s1ZlApm/ik4SfaV3FHoJnN7ZdGdJ0/xN2AUEsLB1/W1NA6X4LW9ANx5LJqv
-gnl9x2Uzri3w+cKM9qSlWAlVhRtEGDlyNSRrTdyCRxs6npONgt5Z2lnCgetq9H+d
-hTWg40Tn4uTZtoj8PrdkEutmSUUCgYEA+I6iCIS9jsO1Dcu2T8T0ETstwP8V/cMf
-SzJ6LAzUi4oNVCFmaZ4nnCiM9S3y6gl2ut/OLQSgYG8cuF+5+Jo4VD4eVjOf9W6s
-BeXSyH2ft3q6pvzNERhQ+bpB8WxRgCB5P4rIerJLNxQDyz2j46YwBgk1AYizEqzt
-d48mk2nO7jECgYA5eigZhPldxpMbQPqv9aqWiWFMXN3Vc7TK5PwWil8Y8txgtfn3
-vdgqUYu4globX/DOCM7HfdFztGeicohl1Ntgj74UEUeA80G1NJ4/Pj0ckIHhiHwP
-EGFDhi3froSe/3bstSNUgR+/CWFyULlqOipbumVFpcKlyGxiMk5rCNhkkQKBgAPX
-iI+jJZ7wTXsiG/ZNsAwYIxPpnXhnrLMn25WUuTBS+PPE9GVLiYczZUJg7HFLpicr
-UG+Hs8bp0MLUz/YUxCwhLazdbWqIxGXu8Hwi3PYkEoCERdMu0gmaJGzL5NKbLeSa
-i5DB8sGuMITSthbNuc5OFCCq8UGnpKAFeW4r44PxAoGADFvBZDoLsYPnCYaCUB0i
-8QEtLIY1ALzCIAYt1zhCoV9VFkafFnr/lFlqZ9NBo46DO/qy/f2j9dpYfGfdZn89
-ELsz2oomSxsv2LNgfriQLf9M/5AKSOSkHgdasZemLYevLmdZKOSrUiFwEooc8INU
-CFZW9YNqkV3IErrXCVZ5SjU=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD0eLyt9JWxYZPl
+8xbz5uVWupHP7Ds7AJTl8lOpVVWN7l7VH9YItYrnySO6dNOSti3sqe3dmi+V4GTx
+HJcmaUjyPAU3BPV5fKzUlw+sEMzN9k7TB/8rYxHeYkrRguzQDpOUItZmiKvSRi0F
+jOHZqYMInEmHkszgyIJ1hOVBmfRe895Qx91HBhD/OajHGzJkZboYLcdeSM0cG1gN
+K6VRhJ/ZPdv7Pq704hCMP/I9iBnN6lG3vl5lOViL/hicpnPm6+oH6gATsomsWyWc
+V/llH3TLiLcFp7+ThQhb1PTMRD9LUZpjILqCK3f0JRZNn/ZPbtzbmOwi4SJOVflb
+lwBNtRM1AgMBAAECggEAI2w7Kpl99y3EWFVYxg52vJJb/lykWHBFIuxx4t9SfjZD
+1229fZWQgvVKEAJNhbyP+vLEXI+yxWy2M5mI7S/kOfUobEhzqR6/jC43Px9QDafa
+1AkcmBTKygZEAQePeLYj/BrwJfs3qkgwzdUUBI3jRqQeo15KAWgMPyr6bP75wagb
+0mRW07XDSkh5N2oGuMywbzVuBGtRSaSf0s+plUFkaQ172ephgYX1QT57H/KE6Bmj
+70IPrdRwReUoTBoPgDtdbgwf6YcXA3+L5iObdfBfbivrlSygkF7Knt6sDL6Y0qr3
+/zFaxMyYTsw2Yon4gv5W1wm3zAnLJ/A2yHE80MGVIQKBgQD/yPeRxpafSw22qsfY
+OO0C7cThdeMAD5dswXBvK8Ab1YGP2fUJIq7p8IxDX579311eEb+tipzzdaNZlFkT
+JA4Yhre6nFDZjqnDcvTIaCeTMiTKWWssiWoRgI889337HMjyACeoZ/tVKN1YmHQ9
+uuPzEHQgaMMwh6YdHOP9zjIMNwKBgQD0rVX6MWBfzU22KFDQfw84PyvwNcmAkWyW
+VlAe8DOKazS5faRaOz7UdaSvH/gTPAPkhv4SjicfJbx+TCy296DYzKONkDXkdDcd
+bOfI/l/nrVt3UaZQQ0Zy7gAxl6soU4bcTgQ7j4ePZnDLVBwcTS/Z55jbiAnoq9ph
+ug/SWZjd8wKBgQChJrKji2SWU6j+LzbdiW/56meiTK2J+kjC4lS+FehhIPER+pYg
+/VMKXN1iDTqUZEfk3nXPFoev86vI4mgEYTDoTugukBF4ICPg2epS4Rwd5ve67P9S
+/fhvsnmMRbl/njEUFvjlZy24B5j9GoAR7E91ciZXzOk9CBmmOe+Cloh9nQKBgQDE
+MPEN6uXCK9cyRuV2KUvE6DKNLDPk2bbeXVtlU2mghhIC4lIU4AijR6nDmrjKg4cD
+iZLUwhNwkEuyYdZA6BKbhItoicgM5XsEJz08F2xDUuhSpq/bD/a/VUPmgB0H+uHa
+aNxP/ejO/W9YOptHvkSuT1xsO4rmfFZholXpb1p6LQKBgQDTrGyvjFBmFeq3b5e/
+lDpzaVQ0G0UGKCYVf84XrUnmwQjeYgMnXKLqrNmf2mC1E3HTZjb8doa+ckuZFT+l
+nTABhJGgV5qwdpZHSOAlBThJDu55hBzZ0iNwoEWI/g2V21frU3gWXZFm7Mwl9Q6h
+V20nkOwTZC9n0HnXYkt6DnXJAw==
 -----END PRIVATE KEY-----
diff --git a/test/core/tsi/test_creds/crl_data/revoked.pem b/test/core/tsi/test_creds/crl_data/revoked.pem
index 8367e794e9c..19812aa2db1 100644
--- a/test/core/tsi/test_creds/crl_data/revoked.pem
+++ b/test/core/tsi/test_creds/crl_data/revoked.pem
@@ -1,20 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIDNDCCAhwCFFIgumScY9chZ0u8tUhjsOUh38hBMA0GCSqGSIb3DQEBCwUAMFYx
-CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMMBnRlc3RjYTAeFw0yMTEyMDMy
-MTE3MzVaFw0zMTEyMDEyMTE3MzVaMFcxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApT
-b21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEDAO
-BgNVBAMMB3Jldm9rZWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2
-ySbOgmRK4lOB+hk4qOiMTW2UxT8FKu/9PoWgIVfkt1CSfK9h+zuAZQKKtW4KNvrf
-Tj24bwQLAMVlkZkDY8R5UTgo3UJJihlvn/82HoeqSHWUHg5sJEsiuoZIFf1XmTuC
-+PnAQBezXIJRFS+oxpvgcGHNNyRsjN+ZAJfQNuSOtHH7TAwdurXJSi5OG3z1dxEr
-vya+cgDh0GKzVyI39bR6upDDfQ3e75P3ydDjz4cOH/cWVrB60XEc6fauV9RLhjFi
-ErpfrlYD+hoHVjp6ugqbXUAhjsxygY/kbBmxTrW2Z+n9BplIDA8O5Tq7LCdahXSw
-1UElCuvrFiURb3NpOCw1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIyy+Y6waxFN
-T0KmZtHk5B1UnPy67Qqo3f4m0vpgz5gaWhX0dRarySyUGdDmfaSdA3wo+j+OplTo
-EFc5YnzUEONVKHhHy5e50ytBYXlHOjlLxidubHQ2JAhduhFA00dHVzYqjmbKCIah
-z8go+x8gctSOvHTy3xYSZ3BxQ0hcZ7P2HxxqUwU0tfaa+cdY1vGeAKhXMz+jSCJl
-5+346R24E3lzKxVVk6SXnjnqBP1ZJNZm4rej+JPvxdMDWEVb8AEaT0gxKkR/+C/j
-OOtpXpxOPHZokjmZj+0zueWXFyxSDkvkbUa1tsQYi2iq0GHB8+i7s9X5Vts+bMuq
-oL1AzNKiiWE=
+MIIC5DCCAcwCCQCLJLAGMmVUfDANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMQ8wDQYDVQQDDAZ0ZXN0Y2EwHhcNMjEwOTIyMDUyNDQ4WhcNMzEw
+OTIwMDUyNDQ4WjASMRAwDgYDVQQDDAdyZXZva2VkMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9Hi8rfSVsWGT5fMW8+blVrqRz+w7OwCU5fJTqVVVje5e
+1R/WCLWK58kjunTTkrYt7Knt3ZovleBk8RyXJmlI8jwFNwT1eXys1JcPrBDMzfZO
+0wf/K2MR3mJK0YLs0A6TlCLWZoir0kYtBYzh2amDCJxJh5LM4MiCdYTlQZn0XvPe
+UMfdRwYQ/zmoxxsyZGW6GC3HXkjNHBtYDSulUYSf2T3b+z6u9OIQjD/yPYgZzepR
+t75eZTlYi/4YnKZz5uvqB+oAE7KJrFslnFf5ZR90y4i3Bae/k4UIW9T0zEQ/S1Ga
+YyC6git39CUWTZ/2T27c25jsIuEiTlX5W5cATbUTNQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQA/lJ/OxQLVo6p2LVznvWoHSEgyPOAmGKG6LZgCcn0Hnu9SXdVzB157
+ya93woq2DlBQkU90TbdbLA8Oa9o6ml54yPErYyffO9JObABhpSxgyj+AqiclTulT
+dNP2RUAMPXEb0AELZqKyLZoyG4We7FhwIp8SdPg9l5vHPKTMTxwY8rRaclViDH2i
+9gmuWtOdopwnaHdxj7CFIeaWytRxG1OcUALFF+SaaRglqhg0LaT0UIx69wqcGeRX
+le1ZphpZCials9Qtis0rxDBQ2E8uoVk8Q8HGDm1NmNOKoktzA31qIF0x64Hggymy
+PaxUJKc2QWOo7pUTGwDjDhicVSbPkMlI
 -----END CERTIFICATE-----
diff --git a/test/core/tsi/test_creds/crl_data/valid.key b/test/core/tsi/test_creds/crl_data/valid.key
index 555b8b9b10a..972d097945b 100644
--- a/test/core/tsi/test_creds/crl_data/valid.key
+++ b/test/core/tsi/test_creds/crl_data/valid.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDJxMSZN6502+2u
-5UGXfB+4ePyDVTGE51w+mCM2s7pVNMFn0cYtEIuF5wvdr2LEiSkYtRqnshxe0B9g
-R8cOvDUH/jS6+DLrQXBQaPQSX29QcbI7YzxmtzpATDhhBgfXzIxWzwLRA9TivKo4
-3aHPZYqWqaRAJEl3/SVFVW0+1BJI7+Do1I+HrT18J7DULqMb/a86N5A4B5PQF9hv
-4u5UxfX4/jqndAsuFhAu0bs+2nUdAnt+IGK/rERfOUE6muK+SYWXiBg+M9De2HjL
-RbYd7nihyKxQw2kDjhURFNOVA9yEHVh34R9qdpQcROF+5Sofs8Zbekahq6j7xYgO
-SDQ6FM4HAgMBAAECggEBAIExyWECUmbpXCwdB/7jr7wDXE0MBAVBz8MUz5d7RdjB
-SwYbQHYinfRDmUl9wBRwbywu6r5uQdREF5Mi4scApERV9ZWyz4fsAuq6CW6qRTCR
-XLrCNC7hLB93rrIRlnwLseDz9K25clssyyJWaAHQ1wjZ3x5jHdgC9BaNOMJ+MKca
-Lk9QSilJBHzz6dDazYECssMt0JK291ZLS/mIsERJnj5ULH67/SePbqyaSvph4/BB
-fjYw8O9rmJQeoTDEYOV44mf54lmR14HXSTUA0VGQsyOpeEwKqvred4M0tegzIRmt
-cNnZD+lx4Hy4x7lj+eU/wXRe9h+joWl8l4oEcNhLRUECgYEA9ZodzQTFaoAI3Yz/
-iSLN2umo+UCK3/i7LxFO/3I37p4Gp4Z/u1okjJ7+DZfe1C/gd27Ua0pqRCM6QJ/9
-UisqWNqu7Sla2jE8+avHNahLpsiJsWpmmGw3YNZOLOnvzumMiniXLQNQMv9lUxXF
-+Pc1f7NGQfi9oF066fyGto1pOU8CgYEA0k+TlnTUqGp81C0eeCpttsCn2N96fmr6
-KWzl0JiniaMiEMfV9OKIOwoMyACOkACxxtAgHy6cdWnzHFQC5UMlX6J+FhlilWPM
-kxT9LqAhusMiW2AomcyyXggwhiKRZcmGE6s8tdi6zdsmu9uqgbOGaORgK50iDVJx
-uKbHNTiKgckCgYEA2GmY4NLXceSn6zEW6iv04HUMI7WvqXNu3SaPSZ/HkUdF7dAi
-NWBU3GQs0KWF/8rAK/1Ix9GmmavA5LkVapYGloz7npbWK3U/mXC39Jv7LVd/nQl4
-pc6VbYrpD8KDQPuij1F7RHqq7IUHL5L8A0kxpvi9a9xWmzwLcarGuY0ZrxkCgYAg
-VmYOI2azgrQw98MQnQ2DpTnpyesO1yoiBoGLwn04V6IcTG3kmpRx54ixlAxXrhOn
-y0a1JLigASuFdpF/aQStINIcWcjjyZWiI/8OFUc6bViyDiYQB/6BIOc9KMGMkiEQ
-kyrhlzKaBpF9HzinetA2/q6e5ilfPQcJanOFBm2dqQKBgQDEwZrspb5vf2mq0djd
-Ll0RFVPf/jJvyDoewVB9woXXAxCahvJ+k9oqJNZo2zhR5Ew45E6Ety8H+8tjJjxK
-WUle2djgyAiVKoATGd/UXEarespoaNsRz8kQ6ql/zEiN1MqTh0j8STdUO42A0JNV
-w21bPt9D1r4z/ouEb53uxtDBFQ==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC4CFzc5ggbenQz
+9L4h6nhO0SLX/bVjORCNNB5cTm01nvmgQi4f3h2YS1afg9wUGmpIQSQW+dl2fSI+
+Nyv3MqHoAzVNanT1jCNN6fK8Rnhl7lK2+qEj52u0jXlIYccOwmprkezrYVR6XtJQ
+2o+JN+CaOmZCMfTzacUiwSRO7O0eDdTFpHyt6nPMZOL13XAdahY/755l6iBfBv//
+edc9IDR0vN53uJlL29CPiTKAweYGuX/k7D94u3AWIiGYJ17e3o0rtbx9HrTTlpbD
+Ft154BrQKWBVjhNJ3CnSrSgXe9s3jjDTt2MxSkFTzJeBcJoAxRMm76zzHIOb4iO1
+M29/RJyTAgMBAAECggEBAJSoFLNPkZ74tKM/gNKOvy4Tm8zToVEMSIV3Y0r3Axq8
+VzKQIwgU+N0LhmaGMiF/EPlavVdd7b7b5+xPztD48nYjGUx2wRGUaPRIFY7mcd0M
+vX4XSFFjX8pSOXUxnoUaoLJSBwo/7eiHbeZoFmgmXeTXZcD078QsXVTspXKnygZq
+j4Kz9xbAgOSUgQqk921HWElW1klkqsnPBVh+K3dUxPraDA6ypgr7gGU6RK/mBJKX
+MNKISj5jd7FyGTgM1+7ES38b5ZOAjoGG2uG2ZjfflsoqcA8jTYaRLCw+FQDtBiOb
+Z8SDqDicN8V8BWHY/Pue/VZHMKQ/NdgJ5RR4WgKE0+kCgYEA7ruEeCDF/gSm0C3h
+vVM6k5RKOzTRKOzrwoZlBoLI0RwQz+n2A4T2KVcsEeHCNy6t6YAc987LLjGHvUMf
+v9oZNxadz2+ucP446nN1QeA0c1qKtsXiv3oJw9AXUfJgQl2qnGaBZlx1R/cY4Ju8
+8tzgX77B11sZEX5lfU7XMvKiPLUCgYEAxVf/bQFHpZEXeUnt9uoqYICpEby664I/
+w4qyClkrqqCR6Q2/2qeFI68i6QJU19pfVf4Xx1WJYZPHgF+8X0BdlrXWPRZOgaw1
+AduOq9yRvHKjzToZTIUmTNGS3byvNA02iklSnJp4z/qq8qdARIz9K4BpzYzBrJo4
+vHB/sKCfCScCgYBE1wnB4iF1uD2p9jEL+P4BJFerbvWJSZhKRZrIH9psgh1O9vYb
+2bFqBlsM5P6uDuXTWUABLT5lmZ68sqhrGCcBPaJP+LJinswmvxhm4JH/WXJ6deGG
+uVgrgMvYs32SZZQW+XAC5lJjaBtiWUZI+ewxb75RrVEzPDFjyuI/LLwfqQKBgCrh
+E/77aDXxcMhJ6ArelpahXhschwDlLDWwzT6yYWqRuSKKekVoYOWACHXYq9a6/DwT
+GdeWHmO1WIPsSWHo+mzk1cgwMJ68bEgbDMULCB+KSU0ucpDN3aSTZPYJKYiF1nP1
+up2McvO946cV8ED04Y2yOUsQaoS2fd10FEqsm+HBAoGAFMfIGHdzcKQCE2j1Boh+
+6VQahRp4iLII+Vj5h9mIhNzGHAs04g9QIZy5kUOeSkOxp9ITTl8vjNxR7eNs9yWq
+20d6is2ODE25ZjHZf8UUCM/CyL8lJjWYr8ecCpVKIlKoZgIVZhGj3MJ1a18LlrbA
+kwY8DkNvKI6LkrwthL318zA=
 -----END PRIVATE KEY-----
diff --git a/test/core/tsi/test_creds/crl_data/valid.pem b/test/core/tsi/test_creds/crl_data/valid.pem
index 83f212180cc..0cd8486742d 100644
--- a/test/core/tsi/test_creds/crl_data/valid.pem
+++ b/test/core/tsi/test_creds/crl_data/valid.pem
@@ -1,20 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIDMjCCAhoCFFIgumScY9chZ0u8tUhjsOUh38hAMA0GCSqGSIb3DQEBCwUAMFYx
-CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMMBnRlc3RjYTAeFw0yMTEyMDMy
-MTE3MTJaFw0zMTEyMDEyMTE3MTJaMFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApT
-b21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDjAM
-BgNVBAMMBXZhbGlkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAycTE
-mTeudNvtruVBl3wfuHj8g1UxhOdcPpgjNrO6VTTBZ9HGLRCLhecL3a9ixIkpGLUa
-p7IcXtAfYEfHDrw1B/40uvgy60FwUGj0El9vUHGyO2M8Zrc6QEw4YQYH18yMVs8C
-0QPU4ryqON2hz2WKlqmkQCRJd/0lRVVtPtQSSO/g6NSPh609fCew1C6jG/2vOjeQ
-OAeT0BfYb+LuVMX1+P46p3QLLhYQLtG7Ptp1HQJ7fiBiv6xEXzlBOprivkmFl4gY
-PjPQ3th4y0W2He54ocisUMNpA44VERTTlQPchB1Yd+EfanaUHEThfuUqH7PGW3pG
-oauo+8WIDkg0OhTOBwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBdXBbqxxBliJ5X
-WCjw/qOtL62xMSRmIX5zTKA0Inx0ZjYBJDLSUjZNLPYzKI1f4dhIMFX3Pc+IaMsg
-9IYF8mDXSkmAflemne5U4soi2xaLiI+3wj7C2KPeM0QJ1X/vI+2OGykH7WhHcNc4
-J+6xqQB/uE1wMOAvxTYvtlfT/C+A7eB68mdzGzLfWYt6TwagNzmBCS0M/qXniJ5a
-ou3/YbdJDyS5ZKgiBwxE66GPtpzQqkJTQLg7D1+RRbk+Y8y7xFRnXPrhmwcJNCoh
-k/qwskicnT+MHkIfcu2BtJuSiqPXhQarYsdGuS/UFTItXfdsF+WalelscRbyawlc
-knGFUGjk
+MIIC4jCCAcoCCQCLJLAGMmVUezANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMQ8wDQYDVQQDDAZ0ZXN0Y2EwHhcNMjEwOTIyMDUyNDI1WhcNMzEw
+OTIwMDUyNDI1WjAQMQ4wDAYDVQQDDAV2YWxpZDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALgIXNzmCBt6dDP0viHqeE7RItf9tWM5EI00HlxObTWe+aBC
+Lh/eHZhLVp+D3BQaakhBJBb52XZ9Ij43K/cyoegDNU1qdPWMI03p8rxGeGXuUrb6
+oSPna7SNeUhhxw7CamuR7OthVHpe0lDaj4k34Jo6ZkIx9PNpxSLBJE7s7R4N1MWk
+fK3qc8xk4vXdcB1qFj/vnmXqIF8G//951z0gNHS83ne4mUvb0I+JMoDB5ga5f+Ts
+P3i7cBYiIZgnXt7ejSu1vH0etNOWlsMW3XngGtApYFWOE0ncKdKtKBd72zeOMNO3
+YzFKQVPMl4FwmgDFEybvrPMcg5viI7Uzb39EnJMCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAEcdAD923j2nFHntNoF3teOa8w8M/nlJmNDkvRWBKPP3kNvyzrMF6D2Aw
+uX6djoi6YkJ1GJ5wG/QHKjYHi1Vja1clsBbDZj4SrEtoQb4/BZ7i21LQjtqgahvJ
+liSPzGDnj2g7I46iUR3GjD+RrX6FtODcwWsMrA58wx+6Yxz8qIRv/kuni+tZ2XGV
+BAA6iKjH+TXmsGHSyX0um/qmuE/wt6b7gVKPZXIp6vIfREH6d7qAHQwbnbd5PNsw
+rrfw6i6hMl/5KpVicVd+1yXFW1VdpMqbbDdIuhao6NEXkGC2/+mWnNufnWyHpobc
+NSboe1ZNMGNgNUANNy3H9Yhppidhgg==
 -----END CERTIFICATE-----
diff --git a/test/core/tsi/test_creds/demoCA/crlnumber b/test/core/tsi/test_creds/demoCA/crlnumber
deleted file mode 100644
index dd11724042e..00000000000
--- a/test/core/tsi/test_creds/demoCA/crlnumber
+++ /dev/null
@@ -1 +0,0 @@
-1001
diff --git a/test/core/tsi/test_creds/demoCA/index.txt b/test/core/tsi/test_creds/demoCA/index.txt
deleted file mode 100644
index e184fd7b63e..00000000000
--- a/test/core/tsi/test_creds/demoCA/index.txt
+++ /dev/null
@@ -1 +0,0 @@
-R	310920052448Z	211102205058Z	8B24B0063265547C	unknown	/CN=revoked
diff --git a/test/core/tsi/test_creds/demoCA/index.txt.attr b/test/core/tsi/test_creds/demoCA/index.txt.attr
deleted file mode 100644
index 8f7e63a3475..00000000000
--- a/test/core/tsi/test_creds/demoCA/index.txt.attr
+++ /dev/null
@@ -1 +0,0 @@
-unique_subject = yes
diff --git a/test/core/tsi/test_creds/demoCA/index.txt.old b/test/core/tsi/test_creds/demoCA/index.txt.old
deleted file mode 100644
index e69de29bb2d..00000000000