diff --git a/cmd/testdata/pki/ca.pem b/cmd/testdata/pki/ca.pem
index b63fab94..b6849e65 100644
--- a/cmd/testdata/pki/ca.pem
+++ b/cmd/testdata/pki/ca.pem
@@ -1,27 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIUVX3IM4foGZSavx8CYfWm5035gs8wDQYJKoZIhvcNAQEL
-BQAwgeYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMSMwIQYDVQQKExpOb3QgQSBDb21wYW55IENBIEZvciBU
-ZXN0czFgMF4GA1UECxNXT29wcyBJIGRpZCBpdCBhZ2FpbiwgSSBwbGF5ZWQgd2l0
-aCB5b3VyIGhlYXJ0LCBnb3QgbG9zdCBpbiB0aGUgZ2FtZS4gT2ggYmFieSBiYWJ5
-IGJhYnkuMSMwIQYDVQQDExpUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0x
-ODA4MTYyMDAwMDBaFw0yMzA4MTUyMDAwMDBaMIHmMQswCQYDVQQGEwJVUzETMBEG
-A1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEjMCEGA1UE
-ChMaTm90IEEgQ29tcGFueSBDQSBGb3IgVGVzdHMxYDBeBgNVBAsTV09vcHMgSSBk
-aWQgaXQgYWdhaW4sIEkgcGxheWVkIHdpdGggeW91ciBoZWFydCwgZ290IGxvc3Qg
-aW4gdGhlIGdhbWUuIE9oIGJhYnkgYmFieSBiYWJ5LjEjMCEGA1UEAxMaVGVzdCBD
-ZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDB/IYY40+YyUyo42bUh6JWgs5ywdCi7nokoYET4VnXiIvxtWAFksAZnNk2
-T+2RqXJuZbknZLNaOFhDsOz21q52zO57T3Q9q7X7XqeW7kAnQ5rkNV1liL3FbUgq
-pm9Ask3wRPU9qx5S8ToBdck25tN4mwjAHmqswaEhfGVK1rXJyuBb2CQO3AWADkOt
-Q8PbiEJus40elY49iYp7vRgNIt53HpD5L9O6hDGLCw0HQDPceGdAVc+CcJMlIJ/0
-W0rGmZbAEZVsoOYYQ0+2aPkIKw+PJ0DMXugZxlXFTUeHn55slMwL7nmN1MIYDElY
-YOvQR391npmjPuSGp9fEhgDmgjSTAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSHjuAR3Zu6D8nvU8Uif7TEMN/ujjAN
-BgkqhkiG9w0BAQsFAAOCAQEAKBmSNB2Htl+nu1/PHrc5pi1UmV9ySrAi1g/DAzDR
-iGwDV5M+fUzdLg9Gb+Pg6b0HaIQRfUs4+qKgzbjCvqfdvk9806BH/1Rpvltiebom
-owk4XSr/28dEpx7VYBl/FC35J4NQ2IIiBM3m8vSoXHWxxONgq3kew0iPdeoJf7Sx
-h2UCaRlAd2IFjZcjUTqEY9nT6VzADoLpYuz5Fol41/iAsULnbut5ALI3IPFjzObm
-DapuCX9xWMoaZ9MzsPMZwxt/KF/NqBXwiOkqzdJhchcnmPerZGq7jIg7VV6pBr4j
-FGmMujqO/UZWu9D/QosIotF3OWlGL5NaZ8isVJ/GJrNJXg==
+MIIFtzCCA5+gAwIBAgIUcYbxViF/fKZg1BwwMGN2FL6EGTIwDQYJKoZIhvcNAQEL
+BQAwazELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xGTAXBgNVBAoMEFNtb2tlc2NyZWVuIFRlc3QxFDASBgNV
+BAsMC1Ntb2tlc2NyZWVuMB4XDTIzMTEwNzIyMDU1NVoXDTMzMTEwNDIyMDU1NVow
+azELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
+biBGcmFuY2lzY28xGTAXBgNVBAoMEFNtb2tlc2NyZWVuIFRlc3QxFDASBgNVBAsM
+C1Ntb2tlc2NyZWVuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx4a5
+2Y4XpdumUADBTa3oIY9kFHvH+yquzRyD4ngRCTKmDq4r1SKpZBQluG18ihf6f7GS
+7BFAl2wIcRt5fZtWmpKgZynLrCx+fiBVrnxKdsiVkZp/nY8hLDnweInYXX6J3UP2
+vmrTl+jGAoylDgQ3aS3gkhVc3QjI6pSg58cDKZYNX22J0whp2DiRHD5T1pYWWAaK
+5Aw0XR1SatvsLSKu6Xga7heTOZH0M06KYSs8h4BklSAdRR7xP+u1VqnXWPKetj8g
+WnqoEQummIrDEZMZAiV3KJANdkDfa66vKnEweIAymqempXK+35gqAmI3ErO4quWD
+mAaZ6iZLzpZxJRNpRyF7LNi5fntaOA67r80yDel6VfaDekoEqVwI6jXCSbLdqzyj
+lD47RQDVZmKX6SSi/skb9lsHc2HpejJyMEDXQPgn+keulIg+/088qWwGgRRTpipt
+NIl2+RSKnK+fqoIhUVQdV9yBJ3MVWXH/H2KfVrOy/TARsai9CsfC6Mt3xM5cOE0r
+WFjybZO1QStenRXjFKMD15zoVM+fYQRYTuO0t1ICSgWAbPNjWpYkTXocbYq/flGY
+KTGfRGAuiEMuRC1HSjgT+ZhARB353oNgfNinh8M/cwGpAPwvsUtLOSTI3z+gZ/eh
+0hE5zAUmI9a7X8t9cXDgiYb6PwTYt7CsY/0YTwMCAwEAAaNTMFEwHQYDVR0OBBYE
+FCJvjD/Gk7eKYbHd4RaBgeyQbY3SMB8GA1UdIwQYMBaAFCJvjD/Gk7eKYbHd4RaB
+geyQbY3SMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAJ5FMe89
+sAQ0YtAj7LmBqx73DlrmwNZ/00N5IZJgoiBYxGQvsc7Y69vBSkiX0ZuJ5i1rkJqL
+ngJTdycOKzc1ofa6kf3JPrxk3EeGEEqCDdByI2eUB9oVxcGtqL1/eAXVYwFjXupY
+/CRkrv1qVSfioyNw1JrLxu0j+zqlfYFc/hUAvPm7HEHTnDKePxf+r1fqztudD4ld
+kjrcxW4otWHxEP4oyadyrcF7NWQK9vgzyXlB3lj57b8qlfrcniCnqYVFsRoCCFoa
++fETmhzgyNsUG5N2YfvDHd8yYuKyRKm+dDnVCN+RIov32oTvIFY5qHdpyjv30wvB
+0hhGpeTgeXY/ddVJu2BU8Ni8xgbKB9tRgPiO88bN4aWKoM6TRlhWfbcvpGKWY9ED
+CVzILzUDydhaqB8iC0NYlcBrooVl7MHkvl/7KW9QC+WKrsIXWeF48sUOtOpTvkfY
+nBjD+1RfHLML66WoferPNoDB1T6vkIcRKbHESYRfRwvsgD2fqVsepvJREt63yHKz
+KJHD/XxJAxMjrqAxqz1t4c/yg2dHA14jL/VgIooUfbvtiljFaDml0tdEIB4n0Ddy
+ckpj/iwIwJsg2yVVuStqWEPeErVmsdsDKbtn3KV6Y7wAQcSWFhJVYwiy78atgxOk
+CIQtLAJVo2DMgpZEHAmrkGlJ/a44blA/zd4b
 -----END CERTIFICATE-----
diff --git a/cmd/testdata/pki/crl.pem b/cmd/testdata/pki/crl.pem
index 4a43e4f2..8deddb31 100644
--- a/cmd/testdata/pki/crl.pem
+++ b/cmd/testdata/pki/crl.pem
@@ -1,21 +1,18 @@
 -----BEGIN X509 CRL-----
-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
+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
+T4MWh0an1F6H6uTv1Rpc
 -----END X509 CRL-----
diff --git a/cmd/testdata/pki/enforce-client-key.pem b/cmd/testdata/pki/enforce-client-key.pem
index bb215c70..5fc4f2ad 100644
--- a/cmd/testdata/pki/enforce-client-key.pem
+++ b/cmd/testdata/pki/enforce-client-key.pem
@@ -1,27 +1,52 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAt0UC/Y6NRTLQ4ruYSfTq06/LfbPvn0xuwUIeE9p3UKMoePop
-khOb1TdSvZSvLh8gIONxLDNvedC4kLEiyiDfkshbC8OW/++PjanWlUYaLJYbsYlk
-bjWqN3T6bGFjXEVwNvBaXr8kFjWaW6BQFUB7co2IAwIQeM9wjP/jZmY6wM+exs8o
-7NoHnBff57Bsl2sNU1whrtC1EDTOrKLJhQaeugMXQPQopscUYQOl3+yEqO3XnhFK
-sHTdC7HV3+eqThWUb1a9mi8/5cDcHl/TSaM1yVt+skWIYIrxyKzowxi9mBMhuILF
-xODAYfe0S5pUyxbI0JMCPuevSWCCiOkZZPSe4QIDAQABAoIBAQC2F5+tBuJeiur5
-HKNneC2KPvTU5N+FS5AP/P2dhEdgm3wvF4AOX+VJqDpRm1WjYdGuW82quUBdrIB1
-Y0rJwnfhg6jSu3dgvEnJ26IVlx2Sh2LktzpONov1pgjbfrgWiffA3ncsBIZ6eq/v
-sg1f0D3Xx8AIHRj4sEOIFQeASrq9rt3l7DnZKwXw2Vu+6pV367y95dl1m2g5BPaM
-BayhKOcB4OMWNbQ4mIWkraClJZCKcWKHo+TZ05wDLPhMc+6Z3QNxZFV1ysicKR2C
-bteVep/LqGsCAVzdEEXsXilfUWgIOf/Hl20haTyluzSqdqxeWUzXJuqWl67b/yN+
-OozLDkpxAoGBANMvve08lgkbFiDudokt8ErhWRQlXtjF6KmijRedzHG3BjFla4kv
-C6Hu9lFhfadhsudABqbShPZTRICI9r1FuaIIvkTuiHz6NlLEPF+SOIodRojL1q0m
-BlfK7qNznXi9EnD8N2yA9A/M3F39Jq7p6QoT6YuZ1ioFtp28LEC7xTG/AoGBAN4o
-vhuKII0/Uq8rBUCr+qecWey0HwKInTJzGcPt97PJUmUpS2ibbUPwjZmdDuYlxh++
-vt8RV8dOGej/xa8I2SJ7Ekmsa8fAhjygtuOWoq5KF/wyVwVBCiohlPvVdEoN5ik0
-WRsdHqiA4k5Xt4Jh60qFi0diBT+t0g808cR2cRdfAoGBAIYsoPinM5PZd7e4iesi
-GrcYcWYRUC9dnjKYqhfFE+1zoSWlECt6jmN11V1jGVhNBENUNGWs/vkZcj5PxqP+
-NrCx6WEWQ/VTa0wujUUTO4TUkMm86EneDM2eivuiKvxY8+yA8h2n2GhpeeDlQ7yB
-tKPIfutI8/6C3sFcmqkOI301AoGBAIHL6BaLAy3DO3ngdrcsQ8w9y0RCkIOYcc+R
-9BHHLRu7mgpEsCwz8wjouLJxUs0gcLsHZNlLdq+ZcAXzufnj/4jnwu2McYRJdaRi
-ebhKwE14OL8+Yh1NvLSU3kisk77YlAqq7QysXMcyVgZTtYHV1/S4RYG1QT/NPJdp
-5X9VfAmdAoGAQRhzShsaGYHUpW25VJLCzkDe/G06//v0/ZDkC95WCLiNXKHr7Npd
-uJgqReaSAkc3ZumJsIlNnSw/ly+ciC53uoHoHq4pvmGFZk/vUKbxNknRcl8R1zRA
-UKMkqQ7tziv1vltExqUWuewQ95SRAFBUdkYFQJm76Os8bsfmRUj6yEQ=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC581NKIuSWzUk0
+ohbyub5o2iPRmbJ4bcvvNwZ3ZUCr+Zuf6RXj2YrM1rcN9twU3x4oK8zJJn25AThZ
+7evaJhJcJvNUDpBKDIr5S+R1XUskBrBcgHOQpEQhZH+rWL4obZ0e+Zk119AhQpJD
+1yEuptoivkI1bkRhbYg3miEfj5mz1VMFBZ3SKvfjvf80VUGdYhSEscHcuwk9jXzr
+wm9/NoJi5L1hrdKPLaYI4LKr/JghcbwZ/RoqEiFKWDsAiZZcItvqeGV2o6TaOlH5
+9osRi7drJJfcwL0v11M5fbcOiIW/tdccp5JEzOEeMD36PjhQvzkFdQE54FFBfZF8
+60wML3vK29Y7ZHHhlRtZ78L+NQ/wBMIhj+tIY0wmf2Xoas+5qQ8Qj5igpBzlymFV
+EKXJfXTWGq4Gmbgpm/j0L0O3/4PbUjJk0H7NpBlA20Pwjp01v1ALYK5BrfvzvR6X
+47YAtYhToxlVFxjWhe+4+hkwxZOdMr/lHJqVlIKP5hGMiFI9sw8B5aAViJkAeLsg
+yXbF3GiCq/ie0AGmxXjQytgaFNPIeeqsSvKS+LZxRSz7nyjtgQh+fHDfzpv4I2MF
+b7xMVgEH69H2LW/wvsMAu7IX2UMaG2UB3FqxwZ2OJE4cHc+ocMUSqlstWihIUjMs
+bIZnA9WLYWO8GdwmAlp7/zY3I1/mGwIDAQABAoICAALzxohASpHMW5Ou2R9sbIX8
+pKHwx0EbOSgonv0pSeARG/PrfvH5o7cB17EskKzyJ+fqXht5dXiI+OyQlvSFMzhs
+U+OrQYYzccdoeY2VeBpv0r/9OBh9Symej1pYk9hPeTWjL9gHf6HvjSPvl/LGKmNv
+0txHTmWfmBCN7WWzYXTV97X2M13BWeMvQoyBqAOIKZw7uEC5ZXmpM+kIUr3ZzzMj
+v4/78wJb7q1oZ93MKlwpkpt1BcPSOt4TzYgCJzV6RjSQScga7ASc9W07CVUzeyuD
+zrduBfLq/8LDaLMd3sW+7NXjITLfb9mLWYiOEVXS22RnSagyFAgupq8tiy0MWfJF
+EO1HZXsbONfCbYqG1ju8k8vaKBjynTaLh/k1r0VW/nmoGduko9k9zvQZefFP1i4j
+NazRihZ2A+uJc/GkMhsmPHP1AnJ1tYAMSRczJKgRqQWqq/VCwiIOTp9nZz9bFGCZ
+BOvVqDvBSOOjd0vWyu7/sCVD+c74b6zZKLV9z3dcONKarrJYy7ArofKtC8Az3ibD
+ke3Y944qVoqU3NG51pHwwvhLztZ1TVjNB/UNkzKTboDMHm5eUVUK3qMOnGpiJExX
+/DeJBpgWIAIFzggBq8TcC/UXx+gibd8mgojGuSEBcOBW3ft9mIjao+xnmikpJ8MY
+tnrLA5xoYthPMAVThAWNAoIBAQD7TOvdOuhMiym+QObG7V+62XZG8AjqXmFpulmf
+0SBhlb1aAHuqkGlOBslPEsktwmby+W2aKIakqyFn4lZ4iAA4wvQrV5DU/dwq0OQh
+HB4wy7YMaShRo4/k0kN3wDH0c7rRm01HLqmg7G5rAynDmdg0nPwId5euefzvDIG1
+jiVoifTAtSYjDO9iO50vGWSRFEHmnB86CqGlL5KQffKDkc40O8iOeEyzYR/Zre7X
+Z7zfm5038NZS5DhASIcptIGnEHuR20j8rRXivF1Hg+/Hq8Udo7ax8bdcGyLQ3vrq
+9qcy8aDknCLQlhykj7LMIBTXrMG1cQgbHsrmovuO/jUHR3IvAoIBAQC9bYv5MDUF
+KXkTinfIfTWr0qqO/a7AXNDVksWetoEaP7c0PM4f7q8B5y2Ksqs8wRRlIy8G9xgt
+Nw1d1fqG7EVNclhL/SxJRgRrR4D9t2nmk0LULX8LDoCF1RLYyy4DNOgwtBI/2B0F
+VL92ISWeBKV4YWo3q62B+/TOCmsEuLw6PIN8bq4TfFQtOi3ccX5rmH7XJsKIdPUo
++DG0KghnulfuHdZhx9VOXIz9k/E3ZKS6QWX5R7Kxy9X7DD3AURyZXeok7ZFzpqf/
+zQei6e2V4/btj85d9GDJpPe35OkKB3MECWFZ502QFbBfFb9fD6banhWz7Ot6RezD
+FPJ3w8DHQCvVAoIBAQCl4ys4CPDbxmmx26n72yp8b5zySvW3sMHhR1BufWBAytYK
+GZOJDndVOImfFymSeWf4MMs3HlVzUjxlFTY7rptm3NrN2aoTz9iMswRFDwim8XKl
+Uq145t3QETTUUh0n31WNlFU5DgaP4kMphRcGtgHRCWgeNsP8Oy7KppjhPopXLepR
+Y8NfE+TaFbw3IS4Pzy2Ji7nZWLdIEdVQaLO0QoW6WVSVJ7iKGS0rRvQJYcN+YH0y
+NltksJ6pYLdIwo1ruSe5KuZNVfzChdGVqfSY/DzMyguJ/6QouwkKlIdSn6vTp0ms
+X51j0BPsVaeTtAHONY5RteHB9Vu/UAt7YzeiLHmlAoIBAG+PhcEzP/aTT0hP423D
+OAnCn0ppYzLNNvyhXRu09mHEJpxwNyEdTBp90Rd/VFQKjn1l9DtQ6P8wDgI2lD5E
+BiivcAsIxr08rDuWOAS0sXznO5OEW+7iEpU/QMNHHgkrbpfIZXsOR0EtgTkMGoBu
+0hkMnia9SAlmnu19uztjpQ9TNkjhUkoNjfG48uuCN+ccP49st2LwJraDPZqSqrKU
+T1bgYbLiouBsp2hsacKq1k0PWQQv0rDdkF8y/Wc3HfXBFrW66E/JVeXUFWxAAvmk
+8XdFm09ALoRzUKUP/qM2celtsNTm4Yo7C81kHHna2PSl57g4jxJK/j6CJq6cLfvq
+8iUCggEAU4CoVMc7Xie7rw2mH1JCr5A3EJiU+QtNOrpUiqMaYi1SOzAFuA+n9gDU
+cgTdlOTG1LVF/CjjwdrMQ8jLG1yLFzwEZVO91c5RXFLtZGVfg/fmYdJ7l04dDfmp
+t0GPS1Eaf34ZtQfr1c9FXowUmF+FhdtRtRoEA91gNY0Ci0M1GptGGqo1Vk0yY8x5
++gIq63YZ208c0eUVnZSNYvm6OyMiLVkjAHgSqzegKRlZXnElFFLozCb5d/iq7JaO
+/C/UaI7cuYSdpj2A4moeyIgm0ma0YHWaDVbSI7t4jVYoE7umKMb8kDMlBOI0B3XQ
+aYHcDZxFvVRMO7c7pbmMAeFI3hqP2A==
+-----END PRIVATE KEY-----
diff --git a/cmd/testdata/pki/enforce-client.pem b/cmd/testdata/pki/enforce-client.pem
index 4b9975c4..0d1a47bf 100644
--- a/cmd/testdata/pki/enforce-client.pem
+++ b/cmd/testdata/pki/enforce-client.pem
@@ -1,28 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIEwzCCA6ugAwIBAgIUP/GSHcjDscrObrduUp6m4kw9AMUwDQYJKoZIhvcNAQEL
-BQAwgeYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMSMwIQYDVQQKExpOb3QgQSBDb21wYW55IENBIEZvciBU
-ZXN0czFgMF4GA1UECxNXT29wcyBJIGRpZCBpdCBhZ2FpbiwgSSBwbGF5ZWQgd2l0
-aCB5b3VyIGhlYXJ0LCBnb3QgbG9zdCBpbiB0aGUgZ2FtZS4gT2ggYmFieSBiYWJ5
-IGJhYnkuMSMwIQYDVQQDExpUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0x
-ODA4MjIyMzQwMDBaGA8yMTE4MDcyOTIzNDAwMFowgccxCzAJBgNVBAYTAlVTMRMw
-EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMT4wPAYD
-VQQKEzVOb3QgQSBSZWFsIENvbXBhbnkgUmVhbGx5IE5vdCBOb3QgTm90IEEgUmVh
-bCBPbmUgTHRkLjEkMCIGA1UECxMbZWdyZXNzbmVlZGluZ3NlcnZpY2UuYXouZW52
-MSUwIwYDVQQDExxlZ3Jlc3NuZWVkaW5nc2VydmljZS1lbmZvcmNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt0UC/Y6NRTLQ4ruYSfTq06/LfbPvn0xu
-wUIeE9p3UKMoePopkhOb1TdSvZSvLh8gIONxLDNvedC4kLEiyiDfkshbC8OW/++P
-janWlUYaLJYbsYlkbjWqN3T6bGFjXEVwNvBaXr8kFjWaW6BQFUB7co2IAwIQeM9w
-jP/jZmY6wM+exs8o7NoHnBff57Bsl2sNU1whrtC1EDTOrKLJhQaeugMXQPQopscU
-YQOl3+yEqO3XnhFKsHTdC7HV3+eqThWUb1a9mi8/5cDcHl/TSaM1yVt+skWIYIrx
-yKzowxi9mBMhuILFxODAYfe0S5pUyxbI0JMCPuevSWCCiOkZZPSe4QIDAQABo4GD
-MIGAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNVHRMB
-Af8EAjAAMB0GA1UdDgQWBBS5ynR8WAv75OJXPsdfFxwaQ/Af8zAfBgNVHSMEGDAW
-gBSHjuAR3Zu6D8nvU8Uif7TEMN/ujjALBgNVHREEBDACggAwDQYJKoZIhvcNAQEL
-BQADggEBAFGIplHbVDXF0+yUGL112HGZTkWpVAnoUeNwv3hBRh89VBFJHISYCX8j
-4fS3B1eHk06PnMXfQ2HrqRGikvJ0DAgNXcq/sVn8rULZcs1YTWiFX//hY9wO4QSn
-2Z7gBxxIdCxrZ/uqHrgMk8zy95NzkzwHRnydmUDbK1gUvPBcYAtttU+zf+0OtINX
-FsOUIrsrCqZVin/5Q9fU85TaCzzznDP4huvlO//qMsEoiWR+QYrRA7kv/QFsDFWi
-RfX9GGXV8iZnAh7DrIxY9j+DxgOm/YJVzDOYR6Cwf1+LnrGNj+75uberALcuTwU6
-3wcpmEEioPMWCmHPQhvqIetHMLLOQNY=
+MIIFvjCCA6agAwIBAgIBAzANBgkqhkiG9w0BAQsFADBrMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEZMBcG
+A1UECgwQU21va2VzY3JlZW4gVGVzdDEUMBIGA1UECwwLU21va2VzY3JlZW4wHhcN
+MjMxMTA3MjEzMzE5WhcNMzMxMTA0MjEzMzE5WjCBijELMAkGA1UEBhMCVVMxEzAR
+BgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoMEFNtb2tlc2NyZWVuIFRlc3QxJDAi
+BgNVBAsMG2VncmVzc25lZWRpbmdzZXJ2aWNlLmF6LmVudjElMCMGA1UEAwwcZWdy
+ZXNzbmVlZGluZ3NlcnZpY2UtZW5mb3JjZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBALnzU0oi5JbNSTSiFvK5vmjaI9GZsnhty+83BndlQKv5m5/pFePZ
+iszWtw323BTfHigrzMkmfbkBOFnt69omElwm81QOkEoMivlL5HVdSyQGsFyAc5Ck
+RCFkf6tYvihtnR75mTXX0CFCkkPXIS6m2iK+QjVuRGFtiDeaIR+PmbPVUwUFndIq
+9+O9/zRVQZ1iFISxwdy7CT2NfOvCb382gmLkvWGt0o8tpgjgsqv8mCFxvBn9GioS
+IUpYOwCJllwi2+p4ZXajpNo6Ufn2ixGLt2skl9zAvS/XUzl9tw6Ihb+11xynkkTM
+4R4wPfo+OFC/OQV1ATngUUF9kXzrTAwve8rb1jtkceGVG1nvwv41D/AEwiGP60hj
+TCZ/Zehqz7mpDxCPmKCkHOXKYVUQpcl9dNYargaZuCmb+PQvQ7f/g9tSMmTQfs2k
+GUDbQ/COnTW/UAtgrkGt+/O9HpfjtgC1iFOjGVUXGNaF77j6GTDFk50yv+UcmpWU
+go/mEYyIUj2zDwHloBWImQB4uyDJdsXcaIKr+J7QAabFeNDK2BoU08h56qxK8pL4
+tnFFLPufKO2BCH58cN/Om/gjYwVvvExWAQfr0fYtb/C+wwC7shfZQxobZQHcWrHB
+nY4kThwdz6hwxRKqWy1aKEhSMyxshmcD1YthY7wZ3CYCWnv/NjcjX+YbAgMBAAGj
+TTBLMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFwkGmF+kzcyEoRQcsRY5Xyx4eAdMB8G
+A1UdIwQYMBaAFCJvjD/Gk7eKYbHd4RaBgeyQbY3SMA0GCSqGSIb3DQEBCwUAA4IC
+AQAVm1qA1Q1XuSGPEHj9B2jTOJ0Z0/0dEvMXuceWAHSlH3Z0+8ntVJsGXaV2b/kF
+ynWYqTWbVoGgx+f5dlMPy5e+qHIpL7kfbY61E0jafoHIG9A4p1UJ+AzYQCdJtbq3
+9bWAHZ97XYE80/pBgH7bSfP9ZlsRzc+4blbYkFOxmtN7a/FbIKUSg2uRLuIq7m94
+X5wGS72GBYMpf2N7u0AxfJ1OEzVpmr/65LU/kc7KF2p/N3jnBIHR2reD12TIClWA
+DykNHQIezwaKpAPckH4gOrDXIGeL7HI9dgp0syv/2K/EvfHKqqjyHUkrsLKlKisc
+/wRpRIL7vwEEy+41rUuI9q04xuFBjffcnbkVTyzkp/XoViOqa4XK56GleT49AC8J
+ryS5JWQginFaUeWVsA7APFi4Pi4fS6B58XLHEKYSU/u/Xcp4PNZ6cOnaeHQCbQvI
+65yJA50u7WttKvLJEmrzAMTSh807tFaAr0Eol2oYNhXykI2i2r3YOgwkZfztIy5d
+VvFWWo0DMRAOlAxJreeerxzNObCOPT+7SdUsZGjNfMwycFbMhNS6t9TFTcF5gP+R
+33Xsh1asvqSLNtQBH5Za0GK5IKWgHU8vO1CpHb7k05qoTuM0e/E/WMm5al3SYarW
+1Wd9epiHL6H3PUZCmBA+gWjfsRARvG64FbmNcbOmMJyv6Q==
 -----END CERTIFICATE-----
diff --git a/cmd/testdata/pki/open-client-key.pem b/cmd/testdata/pki/open-client-key.pem
index d91131ab..0e81b7c1 100644
--- a/cmd/testdata/pki/open-client-key.pem
+++ b/cmd/testdata/pki/open-client-key.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAvQ1m0ZjkLwOJqHZh8x4KP3mcgPutDT8VUl71VddBSsNQxlLE
-gF5+9z9nex8PrhlyudMxVp9LHJO5zEh1F1PxTv2esgGXWHezTsxLieu0CkwBB51K
-KUqI/AFBMBRktydOF5GRnHAtnivDuktfdoT7mS4R9cG/4RAkXSYfJfxRtemXsS/8
-ozwzsjpwbGmqAFqrAzmKO7gp1rae9mfvuvQ1Gjm9lmxp8+LRbgy+xDrN0RyXg5dW
-Ky6J2HkYbd7gkan3PHZk0lj/I9zBuBrNkw2AYUq/5BT5/UrTsGQ7MmwkD2O4QxBu
-YmKU8Wxf1ppiEjkxO8jAVkgt0YDNryQ0MXvPJQIDAQABAoIBAEwvHGIWhM3VVSII
-IszALE0MCt+HjGMsKsF49tDS38LrFp/1Nq6sZenpKSBakg0MwEjWLKnFo5Uuis8h
-2928vB+i4NLHBWBnTGDSvxYjX/hOTJPu9LXTDYTQVJ61eSi9tCCXTuCF7DwzUrq+
-KQgv6tv9zssEeviNcrn+5Mp/9cWiXWKVNSzD2lEmoqxnA7d6AC1srawRXaBYmiHP
-AaYYKR6H6xjT+cE0S2dSEVfGJC9Q9jJJbk1w22C4WQYZv/jparNax6uj1uQNRc0i
-jeuyhacbD6S1ghCHh+9wK8pWZsxttbWYjaV6TSahsnhV41pNkorHhTqxCKbkCZCj
-rer2TcECgYEA2BgjIJ6CoDRRBwNvvK3+3hM8qLc87dYmmaxt2KYtGICf9zp0eVZv
-x3qs/b9BDErd8twzoWt5tU7bTJ2x5hybwlUa+qbgLLoJjad48sM4U/E91WWGDYUe
-/idOTFaCJZc21BW3SMQ1RmHIejOF0k05VlZfISBO6DDv3pkCwBJLD90CgYEA3/bb
-MX6FW4hLMw8zMaKkJ5hBUwnGB+TRch8QNyy42c51Nx+0Xzk4Xn/Vxez/1/+r1U1X
-pFHoqXvpqItsXy7/jdyBcPhuirkJfL3KNRfAsDFO+m6wW6uqe3S6jVbrjaaZ8Ih7
-aRBEgaysUctmpcCIE5RCevSyTdQWy0DirKWda+kCgYBo9LhDBJofY6mjRWkE9GGg
-zSkeLPmb7vKKmzQzEOtARmDrvGmL8Y6TDaNuD3Fxnf9VENzG3yObCzT6bnFUebqx
-VZKoAVtKfgVb1uaoymbWZoqI1imY8XpPKRofe7j0txA7TFzcK+hQSfgMWm/55+Yc
-aBEGTuHkZrhqnli2n2vzxQKBgD2cnm4+PReSJgXU36N+96PA2e+rF6RiSVAYxZA4
-KF4a0tooSamMhzpP9pItgbB9MFtMnJiiw9ukMAJi4JxKxJjVGXLnlRlqj/aWC4OR
-ljuiRPTV8IQ3dH3j/dIWIFTmiSDHmxOrGv2FcB5MU1+z2HtyZNuIZ2jLuL2Piwwt
-v2HJAoGBAKjq7XyTmznKXVaRHX65mYTMHrF4jm1luHQIyUvxKEs/88BiM8LtR7em
-7q8bcuUDnBpvbXt3fLoOTFoaeAYvLko3KfPz36KXBF3Bi7gJCG2Ho1swD4WyrQnb
-OsUtVQF/Ej4w+keEvvSjvYILpH0+O95hUBKihJTcUjff9FwRU/P/
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDJPuPbA/3ngH3x
+ryizsQAr7RTc1moSztICttCP6AUEBvSWBqfjYP5NWZ5Zd4Wtmb0OpDL+XDIiWbcc
+QQjjlcTlA0JI42ioudSY3g6+a5WxuQzYh6PlxfcKm1Joli4uKUWJsfnE0z4ImDub
+7xQY1PXBhlF28H0GUWwiWHT7am79xg0uBGxvfR4WTNpHk9PBCKO/3J2nCaRCgENs
+5EeRwizCWR+G56idQ9cCtQ2wqhequ6jY5TWY/TuL08MF0J6cSsPRSSwZ1fPtEuz4
+Du+djQvhqH4YmJO8lotwV+MW84gm8mv8sZVIff72dhfTP1yX+bdjC/SdS8C2a0xS
+xA91GhMxAgMBAAECggEAWMBeD5xikQKXSIt1eU3BpB2h+kSrMhE5CA5ky1pJP/3r
+RvC3gO0pKaaw0YcHEsj+2iKrBIdXatPDD/hUeb32wALgbDGyWdreee5QdUUQFvlj
+w2iKbQ6RxQE75jj5M81qx++QFfANZw/wFfRpmgvtOARLEBe+I5esBzeYm7pUKaEy
+czP1DPiw7zRijJhrH+zQ8U/tLHilOpguEId1Js5Y6mOsiDfkz+UtoJ9FHVRNUZbn
+2K/YRwyvaf9ALGD+ueQFk6goaKo0RXNlGrw7qkVK69cZ1TmHMLzsnqrJoXWp6sls
+9ysINNeBSN1JP/MMB8IJ2b8ht3L7KVFcoufmIAzTawKBgQDv7CD1oTviMEcfErYL
+1zTiMcmrjrbF4y+O8RMzQbwb0C5c1DmYNtzygAi6LbbXcS4rhTLQT+RV5PLZBnuu
+mFk0JC0Fw1ypqs8jQ6jCegvSpl+dOFMKNL9ShkszNkWZFSJbmcHDPkwwBW0V+Mw8
+QbzlZcQK5ja5/2beCv/xy/rrBwKBgQDWu0MHQ/izrFTfv2whTseOZMlb23diwuCV
+KGFQxUgs9I2lFZYb6pyJfC1btCYwMsifNJ59MUe2h3E8BRZr3VGg5dSYTpyj8DRK
+nRaF3ghL81Bf6PG4gfsFR4kSopUPHa/8HZVqGYm/Yn4z1DPgRNLJrJltd77sPNNI
+G24jG72qBwKBgQC5h3ipWWhMbhbhcX+zQlUTwXp5HuA5wIgLWmMFlQSY4XCoujhb
+e7l6EQYuqqEkktIoN1Vm/xDMV0JwDvJfvlHk30Ctnzgtv/d0BqMe2HACEkQH+QFF
++Com79CBJqvFSDGMcicDC06xJ9EGV6Hfytn+7qYd445YYKc0d38ahSlgywKBgE1R
+lGsTUIPxs4X1eUvs//IH3HFU7wICxbcvmQrqXnjBfhdJVImsyry+l96DWZTVVGPv
+IHpXukjBMEa6Vj50rKXQ2+ITvFdTcKDFO4zsS/R9Ih3G1PLo6qgWAAdTv3R37hxL
+0rcnhvAA2Qx0hlFktrmjioNeMMMDi9hU+C1wGbUVAoGBANtD3FBKM6HQQGaC/DFc
+5WeyceJzw4yKPXPHDU2Z7h5SxsAhsluf+lujMBN1MoVoJXfuLI5gK15lwmIew9oG
+KjH/co9vnA0D0WH/Czq64pdJLLsw7nEaRWx2JazFN1xgutz97uFJlYE5hmEzCgTo
++tE2wXwneeVR037CW8Al9NDy
+-----END PRIVATE KEY-----
diff --git a/cmd/testdata/pki/open-client.pem b/cmd/testdata/pki/open-client.pem
index e86ac29c..8005f17f 100644
--- a/cmd/testdata/pki/open-client.pem
+++ b/cmd/testdata/pki/open-client.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEwDCCA6igAwIBAgIUJ+h1kzABBoEVX4dR3UaYpAzm7k8wDQYJKoZIhvcNAQEL
-BQAwgeYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMSMwIQYDVQQKExpOb3QgQSBDb21wYW55IENBIEZvciBU
-ZXN0czFgMF4GA1UECxNXT29wcyBJIGRpZCBpdCBhZ2FpbiwgSSBwbGF5ZWQgd2l0
-aCB5b3VyIGhlYXJ0LCBnb3QgbG9zdCBpbiB0aGUgZ2FtZS4gT2ggYmFieSBiYWJ5
-IGJhYnkuMSMwIQYDVQQDExpUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0x
-ODA4MjIyMzQwMDBaGA8yMTE4MDcyOTIzNDAwMFowgcQxCzAJBgNVBAYTAlVTMRMw
-EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMT4wPAYD
-VQQKEzVOb3QgQSBSZWFsIENvbXBhbnkgUmVhbGx5IE5vdCBOb3QgTm90IEEgUmVh
-bCBPbmUgTHRkLjEkMCIGA1UECxMbZWdyZXNzbmVlZGluZ3NlcnZpY2UuYXouZW52
-MSIwIAYDVQQDExllZ3Jlc3NuZWVkaW5nc2VydmljZS1vcGVuMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvQ1m0ZjkLwOJqHZh8x4KP3mcgPutDT8VUl71
-VddBSsNQxlLEgF5+9z9nex8PrhlyudMxVp9LHJO5zEh1F1PxTv2esgGXWHezTsxL
-ieu0CkwBB51KKUqI/AFBMBRktydOF5GRnHAtnivDuktfdoT7mS4R9cG/4RAkXSYf
-JfxRtemXsS/8ozwzsjpwbGmqAFqrAzmKO7gp1rae9mfvuvQ1Gjm9lmxp8+LRbgy+
-xDrN0RyXg5dWKy6J2HkYbd7gkan3PHZk0lj/I9zBuBrNkw2AYUq/5BT5/UrTsGQ7
-MmwkD2O4QxBuYmKU8Wxf1ppiEjkxO8jAVkgt0YDNryQ0MXvPJQIDAQABo4GDMIGA
-MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRT7jezZNF2OE/AH3zaaerd1zsqLTAfBgNVHSMEGDAWgBSH
-juAR3Zu6D8nvU8Uif7TEMN/ujjALBgNVHREEBDACggAwDQYJKoZIhvcNAQELBQAD
-ggEBACeAs9OxLshn0yTFqcJoTt4LXsXU2WWxKMf1fReSzidG+8MX/Y5T7rLF6xL4
-vQc9feaGQuDpiJhw0H2dkjHxBD9YRjvrbdyx3yWLKOLkdAVoEFU/TqfPvfwj0naL
-TS4AJa6gRTkut4X378BxwoDdGWZZvdsLJL/T+74OQ9tSfhIzfZ2jfvMbpsI3MkRp
-iC58t0i2a5Uix+l/cAHW4SvYjJl0ndycKp1Nj5o1EtnE+z4BRvoY1OkhZlm4dfCb
-tI4hbmrhh4OWQooYYDIO98f0PRzeFw+hEC+HclIfov8jyEFs46dwuFNzAQn4825Z
-eg+F/xSxOFWRFHpj0vemeF7S0J8=
+MIIEuzCCAqOgAwIBAgIBBDANBgkqhkiG9w0BAQsFADBrMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEZMBcG
+A1UECgwQU21va2VzY3JlZW4gVGVzdDEUMBIGA1UECwwLU21va2VzY3JlZW4wHhcN
+MjMxMTA3MjEzNTI2WhcNMzMxMTA0MjEzNTI2WjCBhzELMAkGA1UEBhMCVVMxEzAR
+BgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoMEFNtb2tlc2NyZWVuIFRlc3QxJDAi
+BgNVBAsMG2VncmVzc25lZWRpbmdzZXJ2aWNlLmF6LmVudjEiMCAGA1UEAwwZZWdy
+ZXNzbmVlZGluZ3NlcnZpY2Utb3BlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMk+49sD/eeAffGvKLOxACvtFNzWahLO0gK20I/oBQQG9JYGp+Ng/k1Z
+nll3ha2ZvQ6kMv5cMiJZtxxBCOOVxOUDQkjjaKi51JjeDr5rlbG5DNiHo+XF9wqb
+UmiWLi4pRYmx+cTTPgiYO5vvFBjU9cGGUXbwfQZRbCJYdPtqbv3GDS4EbG99HhZM
+2keT08EIo7/cnacJpEKAQ2zkR5HCLMJZH4bnqJ1D1wK1DbCqF6q7qNjlNZj9O4vT
+wwXQnpxKw9FJLBnV8+0S7PgO752NC+GofhiYk7yWi3BX4xbziCbya/yxlUh9/vZ2
+F9M/XJf5t2ML9J1LwLZrTFLED3UaEzECAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUF5weO/VgYOaBgxNtyO/RoQJqQ+kwHwYDVR0jBBgwFoAUIm+MP8aTt4ph
+sd3hFoGB7JBtjdIwDQYJKoZIhvcNAQELBQADggIBALRJnIUEUD2oNH0bjnMppqL7
+APzMzkMGGQquZ7Vkx8Kqvi6gCXRW46Q4sUvOOGU4YSeX1/b0431ssC2RHLg0vPSg
+bDLnOfXRTRRwgNt3tknNEy1Ky8YELoQeyjpfs6C3lqjjB42wxfY2AhA3+HqTZaBK
+Jw5vNBmyb2faEcGX2txBSbGMklQ/O7O3frFH5ZH1Sn/be897ceqSYY4hGoMFQ2dn
+8Aocn/o2lwwJ1bxG5E4fqWrhCqW6GJn9TcPqCr5pIpNfYex1/7C8ehixoq3GVbMC
+GGnzuea56Sk/aVbZSTVrmVvHl5RtsEyipHr4d2+T9Mjxok1KqACAnmFCFApBm+j4
+T0MkqWniK8KThF9eQSZPo6QRTu6H2GdJWu3SXKQh5D1DDb43WIDs+QzxKLN8zSUu
+mr3o1/Ho1IxN9CzV5EQW292iUz3OY28HreaejWKL9DvkzhT+CRhUjdRizk1KGqP7
+gYsrWdtA0OlfR77t9R1pm+4Zrq7Vz3ChKNmIxH0hWwy5o1WQuncjXokaQf9q2GbZ
+rASmh4EFQxFbj0NnNLXYw+lZpaTla7rPPsdssd9Klwr1GhCWGHuj8PhkMV20RaXT
+CmXGEgnc7qw6hvbZX1rKs7/nuzmSxAPyHADlsr/Vkdnu1qoAK686OvONypORsFeV
+foPNFS+7V0p5v5OKsim6
 -----END CERTIFICATE-----
diff --git a/cmd/testdata/pki/report-client-key.pem b/cmd/testdata/pki/report-client-key.pem
index 413b318e..8737b063 100644
--- a/cmd/testdata/pki/report-client-key.pem
+++ b/cmd/testdata/pki/report-client-key.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAx01SXuzi4ESwZwqequr+aG9bDc4nwYYugwUu30pyJVzfuUIC
-+Ru4AnXhwj75fPkBkCqofiU0LSuwwRkbfkhld1nmGA9v0KLB+UroAdG+lU0kWZ4D
-bcW21lsGmd2AxHNqDoH7GZ86+PPztmQAN7FhRn5eFmdJG/T+fwgJ8SUGPRwNBnda
-ev6hTWe7D3279I6iIBkB4oDaEp3pMaIi1GdF61N4m8za7zOA8VZmnZ3hiaobkJv5
-eHm7mBWq5afQFkhYvaDi3KLTT7uxfx3bD5vAamemyHG4mMDba3wcQE0KYtFsV4F4
-XWVL7PXm9yi0sQC/70JMfbfhnCwp1EqCdsskOQIDAQABAoIBAExP+QhL4BtLcdgi
-otqDHGLUsKK6m1JolIqqg2YQVWClDS0cb5L+4BhhFs6P2mvV1JllHBshF7dsEUP+
-3x4djmyCya3Qy1mx2GAiJG/95eG5JgAClwGDQR0WwZJM1C9kmelwL7uB0szcbCcc
-Z1Dr5HlfjZs6dS31QzVU2KmzKY5f8EF5UN7gsYBMQZuam4+jhswXNyRhfj+djp1Z
-uAYVcWUvhM+XZqFgSAvud34kDEtgdmt0kAW4cOQRmh3Jjgf8ev6IOJhr28BOta9G
-NIvVuUlnh67yHRywp4C9m5dN52T92mAlBHNJdh/Qoqp91sENmA7hy+ml2l0cmuia
-Ejf/9gECgYEA3X9QXHGLo4PqPTlw4dwIcXvSf1VmP8mRLFMFNnblcFTCuhAnPbOe
-t6dpaNl5CgJjmHtGA23zjfe9HyNZG2cfrxpuGiGEGASXTUl9lAJ/8OBNS1AW5lSt
-jGeAkIWatX5Ic3DNuSJze8y04TEren/SMlQOJF265O+G77R+IMFIDWECgYEA5ljs
-P21uAlOvIjoQnVpLE8ZjvDxCdtqb2BQLuDIySYiZqRxYSJJTn8QTMS0fnT36p5sm
-oXys/9tJM2YMEg3oDkwF7Rp6+R0gx7dpmTw3kXDV2jXiCIfL2rkXWiPXAnRN5AyO
-cZe4HlbTNQlLYSx3E1MUYXa+0W4UPbko7C917dkCgYEAmwBLFkYHOAhKVUnrKsM1
-zWSfK6hxg1XlF6WJUlHlwbQvCNHhBBa8jTzEUTFOuKhvVfd+SUwaUlD5sd6krr59
-t6XBQtwNellMIDO7g2Y0bjYpIPkM7WZ4hHaxy3ETkMqsnMxlypbHRe087xHfoTvt
-tnaH5v8ImMjeHsSqNvXLHEECgYA4D4A/15QkgNVo0RTmFumawHfZghjy8DVpm0dW
-5vCSMOqk278oumQbyA6bs020aTctv3bhaoR4KJhiJ/3cDwJhKGNw1zcClfI6aQsM
-PjmP7hQ97Us7pEEa1F04lOxpLoEedWfdgX1P9PWmPMLZvYalb1zQc6PxOIc4lm29
-PbfH0QKBgCVLdxOq22KYTE6q0TxC22KPXvbFM3faF/KLvOJdj2MswRYszO0iNtfx
-8HaaHeINdHqvc9Z+M9QHy7l6qPtcAsCbFs/EXCYJ5pviLh7NAhflUQpvVviNaB8o
-xAQsdCoDSALoVaJ0WvkV7LknZA3XttxxJ4/ixaiOjw6mdrI/Lw3X
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDIuu7PQiH9JGUU
+d4i38qLaK3+pAP49WHDNC7CWwfJ6HIPhzdYa1IdtaDgngAIODyP3Pug7tZ7P/RUh
+OYq+yiEhYtlOlK63EhD5g7+1NJmSQAXEzvVSY+dId4oLvdrmB5TXIx+DXdgksvcr
+kMrjz/VPtQB/FNkXhF5UHXiKGhMx9+oFZzfFJZYsGybgmCGkiM5eT5jGwHNi4Rbz
+54g+mzSZssyruJTsuY90cQLCtB5adTkp6jEQcL1CxkB0M+QnTZEEo1cATA3FV1il
+A1i5akzvlzqS73u1SOY7UuBYayRKfd9lPtC7oGWCozKiz9s5kug/vQ4IZBPW6zzs
+jKEryPoNAgMBAAECggEAF/pAcZCIR9lTm7TFp5d7vYzppHICbKiGXO/zCackRFLo
+rA3u7+iIPtjusEU5uZ00YiHpEszYqiakogHiIXU6rObGZ30aO7MURQHoYghk+dPc
+/IvuQQe/BmiFHG7y2Xx5WpOO/Z21pnicTt9uZPUf7AQGiaefYRBGRkz466I+vb6V
+tW4rBR8H05FTFYgDj5RzplSBQ6sVJ7/bL2TKasbA4tS1nAfjNIXwZJB5OH7NV+nE
+XZ+dprxfFyVP/NutJb+cWdDRkSYEeicUXK0ZwKYbGbbiCiD6HppWVD8pVpSFMf1R
+/PD6F5AzRC+mSVQtMWjlpJSmQx7eZ8vMwAlst2fewQKBgQDyiL5txkfRB2IfKsqi
+sKrzKFxb//EakLbJ0O3HmPnlpJucGiDgrOSq+BW2XEvGTbln7Dkz1JCYyU/vys59
+BZM6l9CRJxCt6AATO5QlIROWauhdFPPnkmI+vThMwYO5KbHNQVpNVObES6zMblji
+SpTlFjZOMgnJF4NdvY18q5FJbQKBgQDT4AJTekMQMGiQdEhy4gLuhyAZojj18EQj
+I+y6M+PudDJEo6j2aAyVymbqEa2xFm0IDS4T90jOzBWhUC6tcQDJ6UL1IqSaLmvW
+8H2oYO50NNxDJJPb9iarM4/nsEjbyGfgKhtib/QfAL83lx/8qJ3enppTeT+jyYUf
+EgSQCzGvIQKBgQCsLgPy7rcBYFp6geiFgyJ5qYeYEKVcFKyPrfGAp8uRCkEmmy4I
+EvXrol/XrMJmr7sWWg9qClf0/8XuGG5rN1AEYs7AnZkrvO6AuOU9TrQXLyJzInLd
+TYDNxYt4glE/XKhLbT/scn+5j3fHUfdr/0KhOBmpfcCQsE6kd/NANJTaKQKBgQC2
+gQr/5RzHYStw4vlVHCHyXSrlabsu/htzOYq8id4YlLaIMYFlXxMYJBSqIzg+hla8
+zL2YLTXmDB3Fqk/KzsAjLG6kwYaP2NTDfLyAwZ4lMzNYErXajxmX9v5KUKsxxlrT
+2PFlxZG+8uHDfMXs2UHDdVLx/Es5RmkI7nhHq5zMgQKBgDFJOCAKJjVxLJL96hh6
+fNaM2NHSL2TFNd8CNkhjd5x2G5b+3VRh+ugA9uE+xj95lYj5zRYca0d1K+J95m5S
++4Ru/9wIhZEAtBJcqX1rcYgAfbIn39ufJgdk5qN049mtU1HFXB4PZFGJBSU+kwjt
+UzJs0E2GkjW0kxNX5PRmifZn
+-----END PRIVATE KEY-----
diff --git a/cmd/testdata/pki/report-client.pem b/cmd/testdata/pki/report-client.pem
index 10c8483f..c2d60ffc 100644
--- a/cmd/testdata/pki/report-client.pem
+++ b/cmd/testdata/pki/report-client.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEwjCCA6qgAwIBAgIUDnLPVx/5jMD3bIOOUJ9BF8j4OU0wDQYJKoZIhvcNAQEL
-BQAwgeYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMSMwIQYDVQQKExpOb3QgQSBDb21wYW55IENBIEZvciBU
-ZXN0czFgMF4GA1UECxNXT29wcyBJIGRpZCBpdCBhZ2FpbiwgSSBwbGF5ZWQgd2l0
-aCB5b3VyIGhlYXJ0LCBnb3QgbG9zdCBpbiB0aGUgZ2FtZS4gT2ggYmFieSBiYWJ5
-IGJhYnkuMSMwIQYDVQQDExpUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0x
-ODA4MjIyMzQwMDBaGA8yMTE4MDcyOTIzNDAwMFowgcYxCzAJBgNVBAYTAlVTMRMw
-EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMT4wPAYD
-VQQKEzVOb3QgQSBSZWFsIENvbXBhbnkgUmVhbGx5IE5vdCBOb3QgTm90IEEgUmVh
-bCBPbmUgTHRkLjEkMCIGA1UECxMbZWdyZXNzbmVlZGluZ3NlcnZpY2UuYXouZW52
-MSQwIgYDVQQDExtlZ3Jlc3NuZWVkaW5nc2VydmljZS1yZXBvcnQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHTVJe7OLgRLBnCp6q6v5ob1sNzifBhi6D
-BS7fSnIlXN+5QgL5G7gCdeHCPvl8+QGQKqh+JTQtK7DBGRt+SGV3WeYYD2/QosH5
-SugB0b6VTSRZngNtxbbWWwaZ3YDEc2oOgfsZnzr48/O2ZAA3sWFGfl4WZ0kb9P5/
-CAnxJQY9HA0Gd1p6/qFNZ7sPfbv0jqIgGQHigNoSnekxoiLUZ0XrU3ibzNrvM4Dx
-VmadneGJqhuQm/l4ebuYFarlp9AWSFi9oOLcotNPu7F/HdsPm8BqZ6bIcbiYwNtr
-fBxATQpi0WxXgXhdZUvs9eb3KLSxAL/vQkx9t+GcLCnUSoJ2yyQ5AgMBAAGjgYMw
-gYAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMAwGA1UdEwEB
-/wQCMAAwHQYDVR0OBBYEFF6pU24FkUHGN5JOgi5DeWEkyzidMB8GA1UdIwQYMBaA
-FIeO4BHdm7oPye9TxSJ/tMQw3+6OMAsGA1UdEQQEMAKCADANBgkqhkiG9w0BAQsF
-AAOCAQEAiwkL1KJW0lZFe02Fshtd3hZHi8+pPcC7iSAeUSvJT4VbDcJaWs/0Fayu
-xa7nmPH0s70lMq7x7HuZ/ZcJHcsCmDzVO8IwEdJ8HE4ZlgJcLh32kjYRvGZRhRZ7
-wrncqiKpCYJMBXPa2PTHWZ8MsZJOIbPWIh5jyyhct3E/w5oFVVWtQ5UiS7Hknqvn
-EGezsesLWMvWHhambagL5Zd5bPH/8CoUyaDpdD7CF1mRv11rohCZFeQb4t4jreeV
-+6VfNShxwYTvYO1GGXrVekNqLqD3wMRMe1bmJcN4819ySO3CuaS2J8q0L8x2DKKx
-0goL0XQQvj63zuVotWGLZQG+SqGFNQ==
+MIIEvTCCAqWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBrMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEZMBcG
+A1UECgwQU21va2VzY3JlZW4gVGVzdDEUMBIGA1UECwwLU21va2VzY3JlZW4wHhcN
+MjMxMTA3MjEzMDQ0WhcNMzMxMTA0MjEzMDQ0WjCBiTELMAkGA1UEBhMCVVMxEzAR
+BgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoMEFNtb2tlc2NyZWVuIFRlc3QxJDAi
+BgNVBAsMG2VncmVzc25lZWRpbmdzZXJ2aWNlLmF6LmVudjEkMCIGA1UEAwwbZWdy
+ZXNzbmVlZGluZ3NlcnZpY2UtcmVwb3J0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAyLruz0Ih/SRlFHeIt/Ki2it/qQD+PVhwzQuwlsHyehyD4c3WGtSH
+bWg4J4ACDg8j9z7oO7Wez/0VITmKvsohIWLZTpSutxIQ+YO/tTSZkkAFxM71UmPn
+SHeKC73a5geU1yMfg13YJLL3K5DK48/1T7UAfxTZF4ReVB14ihoTMffqBWc3xSWW
+LBsm4JghpIjOXk+YxsBzYuEW8+eIPps0mbLMq7iU7LmPdHECwrQeWnU5KeoxEHC9
+QsZAdDPkJ02RBKNXAEwNxVdYpQNYuWpM75c6ku97tUjmO1LgWGskSn3fZT7Qu6Bl
+gqMyos/bOZLoP70OCGQT1us87IyhK8j6DQIDAQABo00wSzAJBgNVHRMEAjAAMB0G
+A1UdDgQWBBR97GPKBKuzoPRRsozCTT4VSiMtIjAfBgNVHSMEGDAWgBQib4w/xpO3
+imGx3eEWgYHskG2N0jANBgkqhkiG9w0BAQsFAAOCAgEARz//oOQy7tbbjic+gdJu
+OHt4r9vKSCZ5JEkUAwDjRhG8wJsf8LH+FigKMfQvl9rkNebOgcwgyAnQTGu9HPuW
+lnJh72yN40TSPfsnRqfbxivyKqx74Ryaq9jpBIzOAPqZX/WPFoB3jxkd3wDjBV1K
+Xj/9IM46wHhn/9bEYa0j0fWitdBwnxSXykWmkFh3PnvNtb3xx2XADWpTAWJVWF1g
+UxTjQIG/0/S2Z3usa/ZqHRoToHp0pr55b/i09ls1S+fh6GXXatYVxmqZZd8B9TbH
++TbAN4pmDsyMf8PjXLBgJa3OGCqEucjPhyoGaS97pYxUkPQ2eirKBR9sr8hhnzqe
+71KoHV56Waq4T47/BE4nXwPr9BsZuzpqU5EjYaY2Hb3bF++1wQJfocyDS/E+M5/f
+P9goaSwZabapghwqeg0hWH4ObM7vwj9e+F0ntGlbm4TfcfcXnJ3ZByWnZ/vMnFrp
+GWTs6SPdNwgCIjUlizP/yNa1nGS3/Qwu1qYfKq+jnzASP6MTIXgsBLLoNwaLKdKh
+g/mpKpG6Oa+zEV18uCx2UdD7TfEn1SCEhMcJ36UEJZD9NPG9vHzepW73HOn8b9HS
+j+D2mwQu2AhFK6HIndR+itlbbiR/xOp+M24daQDzz7VMsVUcKhnIQUeKHbMg/exV
+fvHhGadusvA2LT2cRNQOemE=
 -----END CERTIFICATE-----
diff --git a/cmd/testdata/pki/revoked-client-key.pem b/cmd/testdata/pki/revoked-client-key.pem
index 47a8385f..ed173c89 100644
--- a/cmd/testdata/pki/revoked-client-key.pem
+++ b/cmd/testdata/pki/revoked-client-key.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAwUcDt9X+8rDwdIJPE9Dx4Tw0JAqp7dn91V/0xzzTdnH/gwLj
-UXD86Og0saHfrwW6dn2m66LsynpLRN8c42SMA+Xg7EOD/3oXLAQ88GV9jCkIFH4W
-vxduSM+EtK/gnL2a8bN4pRMI4Ek3vMQtpd9r6t6KfMUe91KMmO1Xt9bYsAGge74m
-QG9RFnykxgg8N//quTkx4RRcVg4D7HLZuLbG3LL4ruP9pyW62Ugegx8bWlCEo3ol
-xVbPX4rH7bGDsYHqWUcA1TYuhJUU4dcY9//Ue9WRV/rLfg1U6MLa/6ZYQRkciWnC
-9/LR71f4pbqgBQLOavS1Wc4LNgBrzbgpSFwOMQIDAQABAoIBAQC72Rl0AzjXB8Gs
-ezoAOIPeNXU30mV2Fvjt+WUef6/G3uVHn/bvoLEubQFJ49pTcW3Y3CbvvloGMPYW
-6gJZv8+VukbxWm1gUHlU/ol73Cg5oWeJA0N4Vn2JpqeENaxIqr99SsFnLyjhVEgn
-30O+g3ePvts6iRufpUuhFoy60MWpyTjPt5+5cwYx4MIQ4vKY6JxY/lUGWnvyIknT
-8RaAzlq0OxCXX8kdJ5NZrvzTlrcQUvH5tH+dzntO2Cnzbh49YS7EiQRfaWp3wboi
-WItNkSG965F2bkEHm79JIqEDEn2s5IN4FcE1ScvGw8d85NCLvDyaLck5iNzk7XNu
-XRkqb15BAoGBAMsEsaSrSpt+aJctH2aHjuCyTcuqhR7shyl6a6OQgDx+WeWsiJ6g
-Y2qLN86+aILfw67G1s3d9/xJXNU/5BMkBhEvwRCWZQSz7GoMKY5yenPlBxQ8Kxqa
-pz2kW1f8GPI9PiWVtNZ4k9pyVBD+kAJo7FQGLxPkGMerwvmoxVSjHB0jAoGBAPO3
-i6Pq2fzjm/qe3qkT8PxjSJX5Jlk0rL7VVhKGNUW+hpVIQWPMHBUCn8A6cTtFliaD
-rXdXAycUjtIodwGk1Dguw9QsoKMnnXh3lpfv1Q313GGT710TIFsndY3LVdXotaqB
-p/YI4EfeLr1F4x5IYAKRGdtvE4KBALU7UyFEb46bAoGBAJucMHFwXdJLlO1zR6M1
-+lzeLmUSgdDPKVawn/qSEsjLbCpwEZPMigcrSI5uQfs2em3nuNO49JBqxv4pZ68I
-KKJZwRjuveVZ57btNZkaxCM7BC8NY1iT++ZyqRUKhTB/orf6RM8zQtjoUulnxYgj
-VimdR85uQlQhomPsabxS/YSTAoGBAKxCxW58pss6TZtdA2BaefDKdBmc2uAefSL9
-QzMgrTK4sgN96MoTEJ5BFo0WQcZ1LuXWGJvLYq0SuMgOVd9Rk7aKR1wGlxv6+jCV
-xllp6RtO9g/6MiuFQ09qmoo4eFkTfKQhtIgQSgZCIqMhbKCQ41utF6uj3RRW/hsa
-7W0MJBWVAoGBAJIPDm9MuAlXPo5SToP1LgJVewfXTWVgf2lpvdG2OfZ1251zvs1t
-1Io95TD0dHQBZgcJ5rwaZ/jUj2aCXpU89eZxn9aWoCDipChAn97xDzlutBhB6ECY
-eX8areNr2LN19hKqsorxtrEbCsT6hy0l9PrmGU9nIHtXpJ6uHnd/53Gr
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCn8lSw6K0kvdU1
+OWtvWjmfc5PWi5iLxjkPr6IdyU5wEVuzoRvJw5iPvBgAZxxY3HUWza6RGzkieuPP
+u+4YvmjLVu0VTJv20OGGX2dYKLaiAx4F3CKTYq6VOpnnOfzl0+US8rfl140/ahj0
+mW9wGKP2OCChelWCCpsK0yTyhvpoVKAWfHaeFWk1u2zZxp1cmLRYNqDv3gH3PqXK
+AueVLG7mYpiZa0s31WoF38W3m6xcLzcxYa1bhwpC6n4Z+jOXzFAuraY8yE0gMyZv
+NRnyrqy8RL65Hv/UgyfiRSiqrdZAnXPj+ugAalhtdwHuK+QjI78BtQIhVgB+rU2b
+yy1BTxe1AgMBAAECgf8Yu4+uNGhsqUDTdVjqf52s241kEHVKgXl75yuJbW4AYdq4
+uLRyXOCMLBFwPo53UrV7Qtesur5fU2EZ4k8brCgW4r3TjAz1C0w8Xlh992TcqMDU
+Z7PxtPBMhenUXuq5oS9IXpR1oqfPtWvBZvm9JgqxnWleJj9HUB1RMmkO/mOP/L70
+WUTvBrxj5pZM+wAYW4fYyAFtjP32GS3ahib7lTBxRt1szJlJVc/t4XBHhBXAoq87
+w6ejZicckBPB7xWsvn6HBlnOXeis0YW7GQbGosEOKDalSZvfRHVZYEZ0njaBSBmI
+1iZaqA2FcLyYPHkskuEBB5b2iRwvrBkavS75BMECgYEA0GeOqcWfV0eNSErkJFuR
+CLn7zJzzRc/WVnukWKv9hAOuG6mS5HGzYP/7bR9GbarBK7m0iuFxZt8G5VU3cirZ
+EIN2cScsdE0LSOtoAt8hVW4B8epszccIu+hIev/k5jHrzbdrp2LeZ4HCYdTpSW+F
+qgz1S9nz3ittVf+NL76+geUCgYEAzk1jLxfWJZfbaH9761NDr53yBp55k1C9QMMi
+Q7KutabW36j6l9D7UOs2MrhqfooKm7qYdkVCEBB/H79T232kT/1jJ4jI9bUW8Clg
+zX90ZYXnNdYRKmDrjnDPlP7ip5CfN4nv+Vqr/TzKzDaGcoZ1WhgCXQWxzdSR9Oox
+CG91IZECgYAjAhJcAH+IyNM53qK+XMdbQOrEb2UKSCSIOJLd9l5Ky9d2fCDZ0SPB
+2p5gsU1CZNm4P6TNY5uKHVLqOUtsGTiHZp4B2gPEsaCAqlK5kMPntugKvEd0tceI
+0TdDujK4XJBw6SvjXV9g4dJGXt6lYF+CtlSKXl1x57ehJ6GO8KrN5QKBgGperng2
+oxzpCqD7smoomWqwVn0hMvBJHfuJYV5kf/57UqkpmGO0xg/35w8J1Sb/h+65rCi3
+FxPvXYyB+vvd8V2o+XoF5hACWhxkSVxLjjlWbFtuz5T5OhtMgUuCjFz3jZB2V7xL
+CwjcUngu2O2t9E4KuRU7fWzyYHtWUQfXaB5xAoGBAMc0FN7OskhP0cbBnlIO3Gw4
+X97vrNgDKkQS2lZuSMfDK+1YvVD12P4yjSQ9EI/7GgrP+yEjAd9Qi1WlG5VX3OzA
+lu6xMJXd3zH6imMsP0VcswlsLHSIstKY1B8ahucZCxI1+ro7it5k7Go9Jsm3rOI3
+BoY9BI4JobQ5kR/j7Hsy
+-----END PRIVATE KEY-----
diff --git a/cmd/testdata/pki/revoked-client.pem b/cmd/testdata/pki/revoked-client.pem
index 635dbb32..6ceff7ea 100644
--- a/cmd/testdata/pki/revoked-client.pem
+++ b/cmd/testdata/pki/revoked-client.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIExjCCA66gAwIBAgIUDlQvbxavv4v++QbRRxG5wA0kuVUwDQYJKoZIhvcNAQEL
-BQAwgeYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMSMwIQYDVQQKExpOb3QgQSBDb21wYW55IENBIEZvciBU
-ZXN0czFgMF4GA1UECxNXT29wcyBJIGRpZCBpdCBhZ2FpbiwgSSBwbGF5ZWQgd2l0
-aCB5b3VyIGhlYXJ0LCBnb3QgbG9zdCBpbiB0aGUgZ2FtZS4gT2ggYmFieSBiYWJ5
-IGJhYnkuMSMwIQYDVQQDExpUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0x
-ODA4MTYyMDAzMDBaGA8yMTE4MDcyMzIwMDMwMFowgcoxCzAJBgNVBAYTAlVTMRMw
-EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMT4wPAYD
-VQQKEzVOb3QgQSBSZWFsIENvbXBhbnkgUmVhbGx5IE5vdCBOb3QgTm90IEEgUmVh
-bCBPbmUgTHRkLjEkMCIGA1UECxMbZWdyZXNzbmVlZGluZ3NlcnZpY2UuYXouZW52
-MSgwJgYDVQQDEx9pbnN0YW5jZWlkLmVncmVzc25lZWRpbmdzZXJ2aWNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwUcDt9X+8rDwdIJPE9Dx4Tw0JAqp
-7dn91V/0xzzTdnH/gwLjUXD86Og0saHfrwW6dn2m66LsynpLRN8c42SMA+Xg7EOD
-/3oXLAQ88GV9jCkIFH4WvxduSM+EtK/gnL2a8bN4pRMI4Ek3vMQtpd9r6t6KfMUe
-91KMmO1Xt9bYsAGge74mQG9RFnykxgg8N//quTkx4RRcVg4D7HLZuLbG3LL4ruP9
-pyW62Ugegx8bWlCEo3olxVbPX4rH7bGDsYHqWUcA1TYuhJUU4dcY9//Ue9WRV/rL
-fg1U6MLa/6ZYQRkciWnC9/LR71f4pbqgBQLOavS1Wc4LNgBrzbgpSFwOMQIDAQAB
-o4GDMIGAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBSWl8KZKf/fiMgI/+yRBbDN05JXljAfBgNVHSME
-GDAWgBSHjuAR3Zu6D8nvU8Uif7TEMN/ujjALBgNVHREEBDACggAwDQYJKoZIhvcN
-AQELBQADggEBAK7CCneZx8THo+FWDsjtkd+vYQJnGIJtVeZD38qECi++4j8QsPJV
-o1tl/nYLE5CxJf47CaSbIiipQjuNqcaoIgZvKhcZGVcvvIDzM/lGi1uW6SKNuAFe
-NpUvW+4Y2E0sVXBrAs7SegnjLW6HF1ZWsTaLOd1XVNIh+RtDfni/2AR63MNkcnEL
-YWy8lRdWYxM/1P1Vsx8Kbi5pLCozWnaMpVsBUUZYce2E7aO6c7ZfiKFB455HD7/0
-auSYh9uCM2J8p9FHiwjjVyXyv/o8klzZS4njBfFU1DR1g0s7589QgD6CGIdzPjcK
-Wr5XQz8Ml+nQOeh9Voo5dtNxOAupPzX/K5w=
+MIIEwTCCAqmgAwIBAgIBATANBgkqhkiG9w0BAQsFADBrMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEZMBcG
+A1UECgwQU21va2VzY3JlZW4gVGVzdDEUMBIGA1UECwwLU21va2VzY3JlZW4wHhcN
+MjMxMTA3MjEyODM2WhcNMzMxMTA0MjEyODM2WjCBjTELMAkGA1UEBhMCVVMxEzAR
+BgNVBAgMCkNhbGlmb3JuaWExGTAXBgNVBAoMEFNtb2tlc2NyZWVuIFRlc3QxJDAi
+BgNVBAsMG2VncmVzc25lZWRpbmdzZXJ2aWNlLmF6LmVudjEoMCYGA1UEAwwfaW5z
+dGFuY2VpZC5lZ3Jlc3NuZWVkaW5nc2VydmljZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKfyVLDorSS91TU5a29aOZ9zk9aLmIvGOQ+voh3JTnARW7Oh
+G8nDmI+8GABnHFjcdRbNrpEbOSJ648+77hi+aMtW7RVMm/bQ4YZfZ1gotqIDHgXc
+IpNirpU6mec5/OXT5RLyt+XXjT9qGPSZb3AYo/Y4IKF6VYIKmwrTJPKG+mhUoBZ8
+dp4VaTW7bNnGnVyYtFg2oO/eAfc+pcoC55UsbuZimJlrSzfVagXfxbebrFwvNzFh
+rVuHCkLqfhn6M5fMUC6tpjzITSAzJm81GfKurLxEvrke/9SDJ+JFKKqt1kCdc+P6
+6ABqWG13Ae4r5CMjvwG1AiFWAH6tTZvLLUFPF7UCAwEAAaNNMEswCQYDVR0TBAIw
+ADAdBgNVHQ4EFgQUGqG0nTUe0bu0HN2nONmfiJdVlwAwHwYDVR0jBBgwFoAUIm+M
+P8aTt4phsd3hFoGB7JBtjdIwDQYJKoZIhvcNAQELBQADggIBAMJK0ENt7lavtYYY
+0vYIWN45yLhQDqY9DJxWHcYjHeh+kfSdwFyJ/qBsJSZ9yuk6Xa/Sq7n7wqsVjVPf
+rw38jTg0jZn+/1wDYE/h5vqOhF9s5pYkGrNP1tQSiyT/Y8CPBSIWsjdU2Nf6PW0o
+fFOr9IhaAOWHV2azhTaPmeNS5dkd/8DES6He9jKyu7nMk7gLz37aFdgI7GGnP1a3
+lxEJI4tTjfkOs1MPlIphuuBuRNyxIoTajQBAKO+y5sooNTlCssyx/gsrJhI9nNUE
+ASzjoFLLe/cxxBpovQEForZBGYLFp5mxSXg0Hst5XBm1njKEi3gy3ievaB7lrCp8
+h2qwppn8YiNUioTyJJh/UJ/i90o7eF5f5Eo8cnKicZ+I+XY9EwmUUVvzjZCtsuDL
+KHK5fbdVfxmG/6jF6OMwcsDPv0DfTQD5Uzb3CfjchLGxTzN0qmKlDF319VrUHzv5
+Ror7oPmWfFDSJ+7zyN/t9J6oFb2U+EJYg4v63M/ecah4ybND0CahKyBAQfVgpLKn
+YA/2piO7evyTRrhTNZj2V9jHQ8ij2rsCWCUi/0JFbh1qhslifTJsA+DaeDI5hLrr
+ruOwZFST/BKZX8L1zsVSNbkDk9k6YUHeyD6X5pVwt0Ce2xLOs1+I4u/6ac+Es0SI
+B9y7r5FC1SpToV4UL7nyNfTiNMJf
 -----END CERTIFICATE-----
diff --git a/cmd/testdata/pki/server-bundle.pem b/cmd/testdata/pki/server-bundle.pem
index 42afc0ea..307671ec 100644
--- a/cmd/testdata/pki/server-bundle.pem
+++ b/cmd/testdata/pki/server-bundle.pem
@@ -1,56 +1,57 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAthD+jEE4iYUFrdsT1Vpm9hX0OqVVm9mvdz1GF2vpRlsi5ECZ
-d2vczLebs68uwtikWpKrpbv99+y7DWLwcCsleec8SEUEgBHttwze1OhbCsCuWUgp
-QRRyBZ92OynYM2sgg+l6ERdMcT0vey2YRnRL3vheWYd1qJLLB21ORsYGZO9ZVrQp
-Ti+H1VftonYzn/CIbvIwSu3Sgw4v6DT5rQRdyiWAh9i6bnkMBbXSIMYY9tqttpgs
-IUyHgdhNa69oENsYAxonfIAUi4FbVxXHHAlKm54qbnuBPlFlBITWgSAl9BRRo2S7
-NQYfkdUGY8Hhj4gWekFb1D626FuOnVwdjn0G5QIDAQABAoIBAFig9zkRetM/BR+3
-+PSwWFTNJSHzYDRJCOiz1E4Mgvdz4A1bARooUMj7THlw+wNw8LkCkzpPxHcPL5N5
-qXABIPIxxZ+ssV8i2yRzyHm+TqtyVq0xuptqt4LTOHveh9en+6EbZAez3st1LIr7
-DBin/lMhdtSAY59XLiyEYkmDlpNFOnRNuLHbs0ih9/UV0FXKi/kLLMTcPuynxk+N
-FNUfxjooP58hGKAmI703yYf11GmenPCEJ88Q3SO6iN5Et7/kOadFcDmkEWJgjfh0
-07JT9CtMGF04ssDeuIHAWUnqjkrJVi5b2g+Xgy0UrBFhHGFioTlHylPK0XN5tkHM
-wYy9dkECgYEA1VoDE/htkKaNQklueSympmWaXEepm2LIIuLGQxgiTp8FnjPNZOyR
-KX9ybYzya/VAPqful88e3seg3xHvR9nQslWyNjptZpMWlu2LK6VdGXNEniDcNHhA
-q6glW9O/7B03/e1F3oI6rskpbvlgMASURtrbCEw2Zf6k60CxDtkE/TECgYEA2nYA
-hi82s8in84zaZUJfjvzvsKQpfPBAHwRk6ZUgfmLZgzaEW9xZju6lv8B4pyUYOgYC
-7XgvJmQ/HRLkGUbv31aS9wC8j/Sxu0fPDbRh6jZqEJkCohmL7S+nkcTle/T8qEIU
-nqSMApjc0crGwPg2JKpH1DiGvMHrZGYnIHJYZ/UCgYA5SghVjnntQ6vextURWLoP
-KG1ApkWW4fmX1IkkbxCXSAA8MPDQTu3T1NMnM5fNAXgU2wcoYIeLjtNV0v0LsCNo
-H7bQ9PN3fbutH3AlciwDr34Xb/9xX3EOJwKRG9UHU/k7CEGgtBuJ355unCwF+NTQ
-CeiS29Qnoy8ptJ9Wu1OpoQKBgQCnWLuADszNnckiZWSrKtP+ub12x9pMLdJAsGIJ
-GMaCaoCK5gkwQTSNrDxmDi+egmjzkcVOWcFsnGBIij8XKeL4Z94+vl6zu9MmTpTK
-v8I94x8Oxddhi0ZIFDg+DuFoOjwNPEmFWTEzkBufzcDA86KuJY7Of9qe38HM7//K
-+CzGvQKBgCXUqOclsy7oFUs/tMlKQUqHI5jUnv0pwQIQOGQawlT9S9b2YMqKPKee
-FCQPifaDrVseh1+08Vmyo3GMoS3cTtcjsWMFH7R/2sT+MDaFz5Y0I7Xf1MUoZyEv
-FUtowGgyHnyRGNxVySuwKunHlvZJ0KZwyNfjm0PEgLsW8BppH2z5
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDu9U4SOwIhQypo
+iv370antTETk2EkajIwbvNxiJZrsy0SAFtfgInCYYiwjlnPSoV0xNTsvDPKJB1zz
+txUtSCDmUKU8e1gedjOOnaFzGrEPfClLmMTlEUw5qt4/p/8frimjxRVhe7vo+nMM
+bRa20XXxfXQvTHirV79uTnG70hH5apnVHZydRs1KIIbB1LKomTGZeMwPuv/MYOF7
+lEOEIES1alBZsw6GtvfIlwiM18Y5r6dO/FY2GGtCqKeUU4yD9teR+h9Ed0CZitYE
+TLhDWFtNKsbQzQWEGeqYav1Yu8Y0KnN/ceaz/q1t/5a7xDgPN5Skq8SkdUET6XcN
+urFZ6iovAgMBAAECggEAScElK7NS4PleKY5c/lCkZj3YNdocFjmzNQyB6Tk6LERB
+DFgAoYl/v0jt3r4dWbG8leecMNWKNokzQ3YK70MIBI53scdQV3acSzSUFHb0l5b3
+GAI7I4jHQjVfC77Km/ihmY7HHqOWSD6lK/yvuhXElZjnN4Ie7KPUzjMgH5yjN5v6
+1TRkSXchemLiwtiAIlwrTP08GMcJCW7xPssVVeTkLAWU/oxoy5wgtZ1Ah/Z4ZV5K
+KhUSxqmkCwCTAD0t5zG40QShQ8fp9uoV7Af/ozLnyquAXoJnbZOuUh5HhKGj/PWa
+JKAOIh3etRVAKxz1adu6isJ0M+3oeK87vLq1hZuw4QKBgQD6xySe8SiIu4IVSpHv
+xPQHMy45KMDwfih1UXfMXBTHh9WW1pzscvT3Rp5vBWaSQufFUwBdcaYI/acMAp5S
+HTj3IZv/E+XcNFpt9l9kOVWuXqc8ash1pKXyNC1kwBJe5pUoUUEyNE4cifS5sPzh
+0ipUuxXUlomUAtCljGue++0ViwKBgQDz7ycw1B4hGhSVIhJg8scP28fAIjdxQULe
+GDy16pxyYkHXlJWPK1Ye3AEgujrHYUHjzVHRO/ZS0kl3g++ro9kpjenD8xjJTTF1
+fkkcnf/nboxPf6YGR7JjvW45Vnuh8S0fg+rpbEAfQXE1BSUvYASJloA7zoOXHUAL
+uM+tERO6bQKBgQCKWuZEXm5riW/KSVrcer/bXQxKcsaHqEKv/yNl9wNr1fAsCPmI
+ph+qcSalv8gIN6thPVq9Mx9UZIUN5j/ss7yi88L55sNxStz9P+j/BXbU/dmsRomU
+BiObzdehdyprezGdjb63cQ4LRr1i2VebSvUZzCHOKMN8ilUMkL0reHgj4wKBgQCJ
+S+c8FXfr27kQA4BiruMZ6vMwElIwXbIcPXoWTjnGK8WxaEERtyue7Od5mzgwNm6W
+oF7XrK9FCHUvXsRMUEmPmP+lObOOwfL/lZfjEo8RnOg+arNwv3QJrXpXrXSivpNO
+NLrIrRQeQ4BLflzioGGNa3c7sk3ghSciMeA6Ie1/tQKBgQDwptpdhAMP0zizN14W
+zDt8C7StwmeBLeyGJCD8pKuG8bTrKvgzVM570Vjn+TlfOCfevvLQdBSu2x/0NuKK
+/muX7H99C9xsAEldbx6QMLyOcjwfzietBOwLjK91i95OKggNL8jFOykaFjg+Ofk5
+jVlKeCsjDUej/bxWHYIFs8hn2Q==
+-----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIE8jCCA9qgAwIBAgIUejx2LQC4ptEeZtGcE8mI/SQSvbIwDQYJKoZIhvcNAQEL
-BQAwgeYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMSMwIQYDVQQKExpOb3QgQSBDb21wYW55IENBIEZvciBU
-ZXN0czFgMF4GA1UECxNXT29wcyBJIGRpZCBpdCBhZ2FpbiwgSSBwbGF5ZWQgd2l0
-aCB5b3VyIGhlYXJ0LCBnb3QgbG9zdCBpbiB0aGUgZ2FtZS4gT2ggYmFieSBiYWJ5
-IGJhYnkuMSMwIQYDVQQDExpUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0x
-ODA4MTYyMDAwMDBaGA8yMTE4MDcyMzIwMDAwMFowgbsxCzAJBgNVBAYTAlVTMRMw
-EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMUEwPwYD
-VQQKEzhQaG9ueSBUb3RhbGx5IE5vdCBSZWFsIFRlc3QgT3JnIEx0ZC4gTExDLiBJ
-bmMuIENvLiBDb3JwLjEbMBkGA1UECxMSc21va2VzY3JlZW4uYXouZW52MR8wHQYD
-VQQDExZpbnN0YW5jZWlkLnNtb2tlc2NyZWVuMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAthD+jEE4iYUFrdsT1Vpm9hX0OqVVm9mvdz1GF2vpRlsi5ECZ
-d2vczLebs68uwtikWpKrpbv99+y7DWLwcCsleec8SEUEgBHttwze1OhbCsCuWUgp
-QRRyBZ92OynYM2sgg+l6ERdMcT0vey2YRnRL3vheWYd1qJLLB21ORsYGZO9ZVrQp
-Ti+H1VftonYzn/CIbvIwSu3Sgw4v6DT5rQRdyiWAh9i6bnkMBbXSIMYY9tqttpgs
-IUyHgdhNa69oENsYAxonfIAUi4FbVxXHHAlKm54qbnuBPlFlBITWgSAl9BRRo2S7
-NQYfkdUGY8Hhj4gWekFb1D626FuOnVwdjn0G5QIDAQABo4G+MIG7MA4GA1UdDwEB
-/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB0GA1Ud
-DgQWBBTsQf3bQQ33NAzMO+XS51EM8G0HAzAfBgNVHSMEGDAWgBSHjuAR3Zu6D8nv
-U8Uif7TEMN/ujjBGBgNVHREEPzA9gglsb2NhbGhvc3SCFmluc3RhbmNlaWQuc21v
-a2VzY3JlZW6CEnNtb2tlc2NyZWVuLmF6LmVudocEfwAAATANBgkqhkiG9w0BAQsF
-AAOCAQEAXlPFVj0tBlp42/7z6TIEDCAhyAxR7rXYYfvFKihCwbApRNxueVbZw1QB
-rF46ib94fRMX1PEmjoHUVsp3mo3qICpUuXhgb3nDH+zJyshxwmHZpMw1ak3MiT5i
-QLFL91LCSN+dGLaOIGmqXIt+pcYbD6IvQFSz2oJ9C/j+MHt+WvFRBipA8PSDVuC4
-4RSusvBZnS8NqDNnUUy17BQt1j0c4M6PtVrwfu21tIHljbXrVzwPSN4IDYAw+mlK
-rl0sh7UxQxuhV1Yn2NhgAzf8etIvXnstm2eDw+HAI7WLoenbpFDjulEQ/7ulga5z
-ig5WJL3sfDLcHlydbsnBkTjIMHEKKg==
+MIIE+DCCAuCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBrMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEZMBcG
+A1UECgwQU21va2VzY3JlZW4gVGVzdDEUMBIGA1UECwwLU21va2VzY3JlZW4wHhcN
+MjMxMTA3MjEzNzQ4WhcNMzMxMTA0MjEzNzQ4WjB7MQswCQYDVQQGEwJVUzETMBEG
+A1UECAwKQ2FsaWZvcm5pYTEZMBcGA1UECgwQU21va2VzY3JlZW4gVGVzdDEbMBkG
+A1UECwwSc21va2VzY3JlZW4uYXouZW52MR8wHQYDVQQDDBZpbnN0YW5jZWlkLnNt
+b2tlc2NyZWVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7vVOEjsC
+IUMqaIr9+9Gp7UxE5NhJGoyMG7zcYiWa7MtEgBbX4CJwmGIsI5Zz0qFdMTU7Lwzy
+iQdc87cVLUgg5lClPHtYHnYzjp2hcxqxD3wpS5jE5RFMOareP6f/H64po8UVYXu7
+6PpzDG0WttF18X10L0x4q1e/bk5xu9IR+WqZ1R2cnUbNSiCGwdSyqJkxmXjMD7r/
+zGDhe5RDhCBEtWpQWbMOhrb3yJcIjNfGOa+nTvxWNhhrQqinlFOMg/bXkfofRHdA
+mYrWBEy4Q1hbTSrG0M0FhBnqmGr9WLvGNCpzf3Hms/6tbf+Wu8Q4DzeUpKvEpHVB
+E+l3DbqxWeoqLwIDAQABo4GWMIGTMAkGA1UdEwQCMAAwHQYDVR0OBBYEFLVFlN3q
+E4qi/bENj8ND2R+jb/84MB8GA1UdIwQYMBaAFCJvjD/Gk7eKYbHd4RaBgeyQbY3S
+MEYGA1UdEQQ/MD2CCWxvY2FsaG9zdIIWaW5zdGFuY2VpZC5zbW9rZXNjcmVlboIS
+c21va2VzY3JlZW4uYXouZW52hwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQBHgi97
+tFMmeMk43yi76S0nA0udvValKSn9Z031AU+A5s7o+inQLUI7x4MBdsdGd9L6QTzs
+RHk8KxNS9pzdUg/CySI873cWGKwCURT3+m4J0koEwqrO9ynWBmXb5js70uK0I9+M
+uGp9J4B0xpdbrSW4g95j6SaiBK9ZC7iZd7vtAp14s7E6EImQyqM1ZmH1v6fb/dLK
+t6NWtcGGGo2Ep64g/w97B/vpHqeJZePkQL6Et/NSUmJxzC26OI1X4ukURggGu8XB
+rl/ENelEyCL4WNc6C8LLtrg4J9gp1BvOQ+7jaYf+u2wpao4FrgRgz9uMdeJ+aNln
+dwC9DczLMF1UW3Ve6i6M9WsUgYRxe1rLkjc9btJqMbBrxhDOvpIabXu+4nGoBCwV
+9bN5HvJOK2iVIevFFxJiWDt7IADrON+uiSieMc6CvMtCqyAxsyxlvQbFA9nT//7f
+LwZK2wFYlfR0oGJZwrFjutf3Q8pAgyUWO5FnrTGzJsmE+B46T8pILFsJnu9fV5iC
+pMz7o/THFL+dxNPUTUiUSIAGQRjIYCsGJoh8d/EIvuXzAqyEa4xrU5/loP1avxoU
+AOwmseEGhOsBBu1b2Y7wfFSdZxBvgrfpcfrflEozY4FGKnpbp+D/jO232D8NoraI
+B5Ird7f+U0bSPpszX4PMGbydhsuhnbqDamrT0Q==
 -----END CERTIFICATE-----
diff --git a/cmd/testdata/pki/server-key.pem b/cmd/testdata/pki/server-key.pem
index d52ad659..01e56823 100644
--- a/cmd/testdata/pki/server-key.pem
+++ b/cmd/testdata/pki/server-key.pem
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAthD+jEE4iYUFrdsT1Vpm9hX0OqVVm9mvdz1GF2vpRlsi5ECZ
-d2vczLebs68uwtikWpKrpbv99+y7DWLwcCsleec8SEUEgBHttwze1OhbCsCuWUgp
-QRRyBZ92OynYM2sgg+l6ERdMcT0vey2YRnRL3vheWYd1qJLLB21ORsYGZO9ZVrQp
-Ti+H1VftonYzn/CIbvIwSu3Sgw4v6DT5rQRdyiWAh9i6bnkMBbXSIMYY9tqttpgs
-IUyHgdhNa69oENsYAxonfIAUi4FbVxXHHAlKm54qbnuBPlFlBITWgSAl9BRRo2S7
-NQYfkdUGY8Hhj4gWekFb1D626FuOnVwdjn0G5QIDAQABAoIBAFig9zkRetM/BR+3
-+PSwWFTNJSHzYDRJCOiz1E4Mgvdz4A1bARooUMj7THlw+wNw8LkCkzpPxHcPL5N5
-qXABIPIxxZ+ssV8i2yRzyHm+TqtyVq0xuptqt4LTOHveh9en+6EbZAez3st1LIr7
-DBin/lMhdtSAY59XLiyEYkmDlpNFOnRNuLHbs0ih9/UV0FXKi/kLLMTcPuynxk+N
-FNUfxjooP58hGKAmI703yYf11GmenPCEJ88Q3SO6iN5Et7/kOadFcDmkEWJgjfh0
-07JT9CtMGF04ssDeuIHAWUnqjkrJVi5b2g+Xgy0UrBFhHGFioTlHylPK0XN5tkHM
-wYy9dkECgYEA1VoDE/htkKaNQklueSympmWaXEepm2LIIuLGQxgiTp8FnjPNZOyR
-KX9ybYzya/VAPqful88e3seg3xHvR9nQslWyNjptZpMWlu2LK6VdGXNEniDcNHhA
-q6glW9O/7B03/e1F3oI6rskpbvlgMASURtrbCEw2Zf6k60CxDtkE/TECgYEA2nYA
-hi82s8in84zaZUJfjvzvsKQpfPBAHwRk6ZUgfmLZgzaEW9xZju6lv8B4pyUYOgYC
-7XgvJmQ/HRLkGUbv31aS9wC8j/Sxu0fPDbRh6jZqEJkCohmL7S+nkcTle/T8qEIU
-nqSMApjc0crGwPg2JKpH1DiGvMHrZGYnIHJYZ/UCgYA5SghVjnntQ6vextURWLoP
-KG1ApkWW4fmX1IkkbxCXSAA8MPDQTu3T1NMnM5fNAXgU2wcoYIeLjtNV0v0LsCNo
-H7bQ9PN3fbutH3AlciwDr34Xb/9xX3EOJwKRG9UHU/k7CEGgtBuJ355unCwF+NTQ
-CeiS29Qnoy8ptJ9Wu1OpoQKBgQCnWLuADszNnckiZWSrKtP+ub12x9pMLdJAsGIJ
-GMaCaoCK5gkwQTSNrDxmDi+egmjzkcVOWcFsnGBIij8XKeL4Z94+vl6zu9MmTpTK
-v8I94x8Oxddhi0ZIFDg+DuFoOjwNPEmFWTEzkBufzcDA86KuJY7Of9qe38HM7//K
-+CzGvQKBgCXUqOclsy7oFUs/tMlKQUqHI5jUnv0pwQIQOGQawlT9S9b2YMqKPKee
-FCQPifaDrVseh1+08Vmyo3GMoS3cTtcjsWMFH7R/2sT+MDaFz5Y0I7Xf1MUoZyEv
-FUtowGgyHnyRGNxVySuwKunHlvZJ0KZwyNfjm0PEgLsW8BppH2z5
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDu9U4SOwIhQypo
+iv370antTETk2EkajIwbvNxiJZrsy0SAFtfgInCYYiwjlnPSoV0xNTsvDPKJB1zz
+txUtSCDmUKU8e1gedjOOnaFzGrEPfClLmMTlEUw5qt4/p/8frimjxRVhe7vo+nMM
+bRa20XXxfXQvTHirV79uTnG70hH5apnVHZydRs1KIIbB1LKomTGZeMwPuv/MYOF7
+lEOEIES1alBZsw6GtvfIlwiM18Y5r6dO/FY2GGtCqKeUU4yD9teR+h9Ed0CZitYE
+TLhDWFtNKsbQzQWEGeqYav1Yu8Y0KnN/ceaz/q1t/5a7xDgPN5Skq8SkdUET6XcN
+urFZ6iovAgMBAAECggEAScElK7NS4PleKY5c/lCkZj3YNdocFjmzNQyB6Tk6LERB
+DFgAoYl/v0jt3r4dWbG8leecMNWKNokzQ3YK70MIBI53scdQV3acSzSUFHb0l5b3
+GAI7I4jHQjVfC77Km/ihmY7HHqOWSD6lK/yvuhXElZjnN4Ie7KPUzjMgH5yjN5v6
+1TRkSXchemLiwtiAIlwrTP08GMcJCW7xPssVVeTkLAWU/oxoy5wgtZ1Ah/Z4ZV5K
+KhUSxqmkCwCTAD0t5zG40QShQ8fp9uoV7Af/ozLnyquAXoJnbZOuUh5HhKGj/PWa
+JKAOIh3etRVAKxz1adu6isJ0M+3oeK87vLq1hZuw4QKBgQD6xySe8SiIu4IVSpHv
+xPQHMy45KMDwfih1UXfMXBTHh9WW1pzscvT3Rp5vBWaSQufFUwBdcaYI/acMAp5S
+HTj3IZv/E+XcNFpt9l9kOVWuXqc8ash1pKXyNC1kwBJe5pUoUUEyNE4cifS5sPzh
+0ipUuxXUlomUAtCljGue++0ViwKBgQDz7ycw1B4hGhSVIhJg8scP28fAIjdxQULe
+GDy16pxyYkHXlJWPK1Ye3AEgujrHYUHjzVHRO/ZS0kl3g++ro9kpjenD8xjJTTF1
+fkkcnf/nboxPf6YGR7JjvW45Vnuh8S0fg+rpbEAfQXE1BSUvYASJloA7zoOXHUAL
+uM+tERO6bQKBgQCKWuZEXm5riW/KSVrcer/bXQxKcsaHqEKv/yNl9wNr1fAsCPmI
+ph+qcSalv8gIN6thPVq9Mx9UZIUN5j/ss7yi88L55sNxStz9P+j/BXbU/dmsRomU
+BiObzdehdyprezGdjb63cQ4LRr1i2VebSvUZzCHOKMN8ilUMkL0reHgj4wKBgQCJ
+S+c8FXfr27kQA4BiruMZ6vMwElIwXbIcPXoWTjnGK8WxaEERtyue7Od5mzgwNm6W
+oF7XrK9FCHUvXsRMUEmPmP+lObOOwfL/lZfjEo8RnOg+arNwv3QJrXpXrXSivpNO
+NLrIrRQeQ4BLflzioGGNa3c7sk3ghSciMeA6Ie1/tQKBgQDwptpdhAMP0zizN14W
+zDt8C7StwmeBLeyGJCD8pKuG8bTrKvgzVM570Vjn+TlfOCfevvLQdBSu2x/0NuKK
+/muX7H99C9xsAEldbx6QMLyOcjwfzietBOwLjK91i95OKggNL8jFOykaFjg+Ofk5
+jVlKeCsjDUej/bxWHYIFs8hn2Q==
+-----END PRIVATE KEY-----
diff --git a/cmd/testdata/pki/server.pem b/cmd/testdata/pki/server.pem
index c2797d6e..136a1a53 100644
--- a/cmd/testdata/pki/server.pem
+++ b/cmd/testdata/pki/server.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE8jCCA9qgAwIBAgIUejx2LQC4ptEeZtGcE8mI/SQSvbIwDQYJKoZIhvcNAQEL
-BQAwgeYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMSMwIQYDVQQKExpOb3QgQSBDb21wYW55IENBIEZvciBU
-ZXN0czFgMF4GA1UECxNXT29wcyBJIGRpZCBpdCBhZ2FpbiwgSSBwbGF5ZWQgd2l0
-aCB5b3VyIGhlYXJ0LCBnb3QgbG9zdCBpbiB0aGUgZ2FtZS4gT2ggYmFieSBiYWJ5
-IGJhYnkuMSMwIQYDVQQDExpUZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTAgFw0x
-ODA4MTYyMDAwMDBaGA8yMTE4MDcyMzIwMDAwMFowgbsxCzAJBgNVBAYTAlVTMRMw
-EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMUEwPwYD
-VQQKEzhQaG9ueSBUb3RhbGx5IE5vdCBSZWFsIFRlc3QgT3JnIEx0ZC4gTExDLiBJ
-bmMuIENvLiBDb3JwLjEbMBkGA1UECxMSc21va2VzY3JlZW4uYXouZW52MR8wHQYD
-VQQDExZpbnN0YW5jZWlkLnNtb2tlc2NyZWVuMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAthD+jEE4iYUFrdsT1Vpm9hX0OqVVm9mvdz1GF2vpRlsi5ECZ
-d2vczLebs68uwtikWpKrpbv99+y7DWLwcCsleec8SEUEgBHttwze1OhbCsCuWUgp
-QRRyBZ92OynYM2sgg+l6ERdMcT0vey2YRnRL3vheWYd1qJLLB21ORsYGZO9ZVrQp
-Ti+H1VftonYzn/CIbvIwSu3Sgw4v6DT5rQRdyiWAh9i6bnkMBbXSIMYY9tqttpgs
-IUyHgdhNa69oENsYAxonfIAUi4FbVxXHHAlKm54qbnuBPlFlBITWgSAl9BRRo2S7
-NQYfkdUGY8Hhj4gWekFb1D626FuOnVwdjn0G5QIDAQABo4G+MIG7MA4GA1UdDwEB
-/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB0GA1Ud
-DgQWBBTsQf3bQQ33NAzMO+XS51EM8G0HAzAfBgNVHSMEGDAWgBSHjuAR3Zu6D8nv
-U8Uif7TEMN/ujjBGBgNVHREEPzA9gglsb2NhbGhvc3SCFmluc3RhbmNlaWQuc21v
-a2VzY3JlZW6CEnNtb2tlc2NyZWVuLmF6LmVudocEfwAAATANBgkqhkiG9w0BAQsF
-AAOCAQEAXlPFVj0tBlp42/7z6TIEDCAhyAxR7rXYYfvFKihCwbApRNxueVbZw1QB
-rF46ib94fRMX1PEmjoHUVsp3mo3qICpUuXhgb3nDH+zJyshxwmHZpMw1ak3MiT5i
-QLFL91LCSN+dGLaOIGmqXIt+pcYbD6IvQFSz2oJ9C/j+MHt+WvFRBipA8PSDVuC4
-4RSusvBZnS8NqDNnUUy17BQt1j0c4M6PtVrwfu21tIHljbXrVzwPSN4IDYAw+mlK
-rl0sh7UxQxuhV1Yn2NhgAzf8etIvXnstm2eDw+HAI7WLoenbpFDjulEQ/7ulga5z
-ig5WJL3sfDLcHlydbsnBkTjIMHEKKg==
+MIIE+DCCAuCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBrMQswCQYDVQQGEwJVUzET
+MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEZMBcG
+A1UECgwQU21va2VzY3JlZW4gVGVzdDEUMBIGA1UECwwLU21va2VzY3JlZW4wHhcN
+MjMxMTA3MjEzNzQ4WhcNMzMxMTA0MjEzNzQ4WjB7MQswCQYDVQQGEwJVUzETMBEG
+A1UECAwKQ2FsaWZvcm5pYTEZMBcGA1UECgwQU21va2VzY3JlZW4gVGVzdDEbMBkG
+A1UECwwSc21va2VzY3JlZW4uYXouZW52MR8wHQYDVQQDDBZpbnN0YW5jZWlkLnNt
+b2tlc2NyZWVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7vVOEjsC
+IUMqaIr9+9Gp7UxE5NhJGoyMG7zcYiWa7MtEgBbX4CJwmGIsI5Zz0qFdMTU7Lwzy
+iQdc87cVLUgg5lClPHtYHnYzjp2hcxqxD3wpS5jE5RFMOareP6f/H64po8UVYXu7
+6PpzDG0WttF18X10L0x4q1e/bk5xu9IR+WqZ1R2cnUbNSiCGwdSyqJkxmXjMD7r/
+zGDhe5RDhCBEtWpQWbMOhrb3yJcIjNfGOa+nTvxWNhhrQqinlFOMg/bXkfofRHdA
+mYrWBEy4Q1hbTSrG0M0FhBnqmGr9WLvGNCpzf3Hms/6tbf+Wu8Q4DzeUpKvEpHVB
+E+l3DbqxWeoqLwIDAQABo4GWMIGTMAkGA1UdEwQCMAAwHQYDVR0OBBYEFLVFlN3q
+E4qi/bENj8ND2R+jb/84MB8GA1UdIwQYMBaAFCJvjD/Gk7eKYbHd4RaBgeyQbY3S
+MEYGA1UdEQQ/MD2CCWxvY2FsaG9zdIIWaW5zdGFuY2VpZC5zbW9rZXNjcmVlboIS
+c21va2VzY3JlZW4uYXouZW52hwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQBHgi97
+tFMmeMk43yi76S0nA0udvValKSn9Z031AU+A5s7o+inQLUI7x4MBdsdGd9L6QTzs
+RHk8KxNS9pzdUg/CySI873cWGKwCURT3+m4J0koEwqrO9ynWBmXb5js70uK0I9+M
+uGp9J4B0xpdbrSW4g95j6SaiBK9ZC7iZd7vtAp14s7E6EImQyqM1ZmH1v6fb/dLK
+t6NWtcGGGo2Ep64g/w97B/vpHqeJZePkQL6Et/NSUmJxzC26OI1X4ukURggGu8XB
+rl/ENelEyCL4WNc6C8LLtrg4J9gp1BvOQ+7jaYf+u2wpao4FrgRgz9uMdeJ+aNln
+dwC9DczLMF1UW3Ve6i6M9WsUgYRxe1rLkjc9btJqMbBrxhDOvpIabXu+4nGoBCwV
+9bN5HvJOK2iVIevFFxJiWDt7IADrON+uiSieMc6CvMtCqyAxsyxlvQbFA9nT//7f
+LwZK2wFYlfR0oGJZwrFjutf3Q8pAgyUWO5FnrTGzJsmE+B46T8pILFsJnu9fV5iC
+pMz7o/THFL+dxNPUTUiUSIAGQRjIYCsGJoh8d/EIvuXzAqyEa4xrU5/loP1avxoU
+AOwmseEGhOsBBu1b2Y7wfFSdZxBvgrfpcfrflEozY4FGKnpbp+D/jO232D8NoraI
+B5Ird7f+U0bSPpszX4PMGbydhsuhnbqDamrT0Q==
 -----END CERTIFICATE-----