regenerate test secrets

Makefile

@@ -29,6 +29,10 @@ testing: dep-up test dep-down
 test: clean
 	go test -v -vet=all -failfast -race
 
+.PHONY: test-secrets
+test-secrets:
+	cd test-secrets ; /usr/bin/env bash create-certs.sh
+
 clean:
 	rm -f kt
 	rm -f kt-*.txz

test-secrets/broker1-ca1-signed.crt

@@ -1,19 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDBjCCAe6gAwIBAgIUQLTARfFpFqJ02GybrjTPme2jKzYwDQYJKoZIhvcNAQEL
+MIIDyDCCArCgAwIBAgIULxF6KJKCcA9Uqd8v73k/6ZoJgcgwDQYJKoZIhvcNAQEL
 BQAwMDESMBAGA1UEAwwJbG9jYWxob3N0MQ0wCwYDVQQLDARURVNUMQswCQYDVQQK
-DAJLVDAeFw0yMTExMTgyMTI0MTdaFw00OTA0MDQyMTI0MTdaMDAxCzAJBgNVBAoT
-AktUMQ0wCwYDVQQLEwRURVNUMRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDd4OJqo0bLyV071DOTC9GirhiMXnfo8zcz
-0TX8pVquCv34sPTIRJHdJQ6LGVG0nhpwPc7sr0ws7sadpVj043FBeDizxc4G4boP
-1c/yITGm7FVNcNJ5xj/jO5jnrLnI0ObjpT+IuLzX6Gb3HuheH1Dik8s1PzHW/YOC
-wURCaIrRe4b/1w2Mor5t9BFSSQaVRXqSeEVukU2HCLFoe237FuXGGb+ojLvEpxQR
-N3598RvCgCpJHlX9nVuhOedLvI35uf89ycfcyEj2hrZzLgybLcABazkDlGTgGQFx
-BuVOy/qvtH4bAvitbo/MNjYWnOfIjYBL9MBBe5J39a2jM56iN18NAgMBAAGjGDAW
-MBQGA1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAPlj6zu1d
-G2aCB4v0cs+kftDhmBTbIj+QuyoSbjcqclbFDy6duxAOspjzqckCFsRPQE1b3LfE
-l7ml0Q0W3E+DgpRilH65vSmMOUxoJNF+ZnOxgrHk47SKhS6MyVT+ixg1dx/nwfNh
-+HLMdthMs7csgbRkmckXkWlfhL3SUQPlqEho11rgArFIg54Qy6sLiZkeH7P+JV59
-QNXPbaU3wcWfy8IqHe4+CAysZfhYgyJGcbWzLVQONArrPeOhvwg5RaacVBv5LFdN
-SQK56P8JatNwuNmyF6ohdhK32H0DSJAThRtf+FormFVcoM54pw74HOvvzqtW5Y+A
-4xVXYYw1WXKVpA==
+DAJLVDAgFw0yMzA5MDkwOTI0MzNaGA8yMDUxMDEyNDA5MjQzM1owMDELMAkGA1UE
+ChMCS1QxDTALBgNVBAsTBFRFU1QxEjAQBgNVBAMTCWxvY2FsaG9zdDCCAaIwDQYJ
+KoZIhvcNAQEBBQADggGPADCCAYoCggGBAJCo4CkX3xYZ0eHO1lhaIU5OFmnmw/7L
+gn4w+Zz5HFarzrdmwA/jEJJG8QZc4NrKD9l8KoWqI+ilmGyQYBwwTxe3+Z/YDmpa
+1v9eClCy7ITEO67rCpifFlQ1X6V3i6xY5/m0zJCO6xdRGwJCXKcq0QW5l3ulZkuq
+jqneqV0DmQFDNwl8+Gq6oqI86XU9dZQaOCeVXgq2HRlpErefqAzIfcowdNUTRyt0
+6irgPwkGU5YnvIfGSjZZIgekybQHuVs0kKzkQQ7uo8pQQoYLCOG4MveAkl6f9BhJ
+pVnxoa42KExIMbxL7Lx4rLTTy7BrWBh6WeTZTmncOVc3/ZfBUqCAdMvwmN7wNiJu
+tOEsfCUTX8vbMKUHIAuLyjM4TYi4K5/hYdw5Mu6W8GDnz2OuuRcqtmTn2d+m7ha/
+Xys+Ulv10nuqxljjlncAZ4uZhAZ5nGcU8Ly2e/2BHND7Sj5BQsCdLDqBELcil0ef
+uLiT1PsZRvdb+HDYXuRHCmR50F9GkHI49wIDAQABo1gwVjAUBgNVHREEDTALggls
+b2NhbGhvc3QwHQYDVR0OBBYEFBzpPQpZk8jnAi78U33bOdtLDOARMB8GA1UdIwQY
+MBaAFP74c8JMNP2DEvyjWf4rkS1ez16nMA0GCSqGSIb3DQEBCwUAA4IBAQBF+N2d
+ng85nfowXjf5QpCFfAVSFn8wyNrH6OLth7Qyjim0e+X1G7sbvy4nb3glv/lrqHqw
+p30SqXZnLUq6PANeOOELwfeqwEtEC1eVezzx525wbAZycKoo216w+ff5rAFn2kaM
+MuOCVgQWbOhBwEELMIZdBjl+NhZMcGH5sLwwTms7vatoJTZMhSYq6VS9NTb9PiGF
+WC9H8KmC3cxXVy/c3n8H4//fbJGFIznmjggJZcnbjHIUfnIRLN1HpcEKwLKlfldq
+e3oT9llbazrobGGn9xb4tQhIi03Hb//jpLMdaZgyYQuSkzEd6KNi7T5Ua7Mvna5y
+LRWgZhcu5S/l7VLJ
 -----END CERTIFICATE-----

test-secrets/broker1.csr

@@ -1,17 +1,22 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIICpTCCAY0CAQAwMDELMAkGA1UEChMCS1QxDTALBgNVBAsTBFRFU1QxEjAQBgNV
-BAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN3g
-4mqjRsvJXTvUM5ML0aKuGIxed+jzNzPRNfylWq4K/fiw9MhEkd0lDosZUbSeGnA9
-zuyvTCzuxp2lWPTjcUF4OLPFzgbhug/Vz/IhMabsVU1w0nnGP+M7mOesucjQ5uOl
-P4i4vNfoZvce6F4fUOKTyzU/Mdb9g4LBREJoitF7hv/XDYyivm30EVJJBpVFepJ4
-RW6RTYcIsWh7bfsW5cYZv6iMu8SnFBE3fn3xG8KAKkkeVf2dW6E550u8jfm5/z3J
-x9zISPaGtnMuDJstwAFrOQOUZOAZAXEG5U7L+q+0fhsC+K1uj8w2Nhac58iNgEv0
-wEF7knf1raMznqI3Xw0CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYE
-FHHoMG6vGRAYMB4rvjLJpquFMG7lMA0GCSqGSIb3DQEBCwUAA4IBAQA20Dtm38lA
-mxDH+0tMDATOZC21gCRvLVAWKUXjiaJE3kLSBpj3ftQvf4lMX/+8/aRrp81l9lxi
-sLDd4EqdiGTy02GlFq6agvWUCWAaTV60XDU2KEKuk0DHqaRtvvx77eQGtvHkDnhv
-3HSNOl4LfRrgt+M33Ge/OaKQKg18gvXwufH8MyLB6n81f41TF4gDcMIhXxip6/QL
-atBdi8FTOakiaMeYEIzCwEyp/sAxBqyY8rkBe9C63RXUJ/Z6CDHsxWfd7W2ohBsx
-YZNSc2kCSAL2EgilLMNVBazBPh/gYuvT9EkIgdjMCjizL2CtK0QUhvd3o0Ji73P4
-FZZSKXmmAxPP
+MIIDpTCCAg0CAQAwMDELMAkGA1UEChMCS1QxDTALBgNVBAsTBFRFU1QxEjAQBgNV
+BAMTCWxvY2FsaG9zdDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAJCo
+4CkX3xYZ0eHO1lhaIU5OFmnmw/7Lgn4w+Zz5HFarzrdmwA/jEJJG8QZc4NrKD9l8
+KoWqI+ilmGyQYBwwTxe3+Z/YDmpa1v9eClCy7ITEO67rCpifFlQ1X6V3i6xY5/m0
+zJCO6xdRGwJCXKcq0QW5l3ulZkuqjqneqV0DmQFDNwl8+Gq6oqI86XU9dZQaOCeV
+Xgq2HRlpErefqAzIfcowdNUTRyt06irgPwkGU5YnvIfGSjZZIgekybQHuVs0kKzk
+QQ7uo8pQQoYLCOG4MveAkl6f9BhJpVnxoa42KExIMbxL7Lx4rLTTy7BrWBh6WeTZ
+TmncOVc3/ZfBUqCAdMvwmN7wNiJutOEsfCUTX8vbMKUHIAuLyjM4TYi4K5/hYdw5
+Mu6W8GDnz2OuuRcqtmTn2d+m7ha/Xys+Ulv10nuqxljjlncAZ4uZhAZ5nGcU8Ly2
+e/2BHND7Sj5BQsCdLDqBELcil0efuLiT1PsZRvdb+HDYXuRHCmR50F9GkHI49wID
+AQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQUHOk9ClmTyOcCLvxTfds5
+20sM4BEwDQYJKoZIhvcNAQEMBQADggGBACarwzOjCatZECC11vzm/2oVP3x9S5xQ
+7i9u6id0ps/hdgj3mne1RjTjFbae35TqIp/ZvcfTq0Bba/8S3Z4RDpdqBymPhCWV
+87R2hnLQAkayeIWJonbRczS/PpbpCwOJ5I+JPO1FC8Z92hZr6WY5yi6cD5Qhwhxd
+GtprEGOAVPLm+1GdeeyAwcGRisVDSSxHLvTdluq1bt3h7zhYfrCcXgW+toqiKNGB
+Yvuj+g8pD/ApNXvqO1DHwbnzc75y5fmZihtgNLc8Ivr2QUzSLP1eVIUJ5HYT3cV4
+j5kUBVaaVkMDipY/JUYCz1Xoy/ZI74cMUWvdNFgFNddNsFYYQGdiQUEoy3Ob6Ol6
+0aL9mIk2r7jEedkKdjLOh0hIf/+3tw+a7/1FiDZ9/QShvUF57FIh3ioaIxOfEsIA
+cHdcH3xGbqDv3NDmYJ+hGuIyrbOlQldljfWgwGWmqItu3E4f61CWAW30Nc+YGv45
+Ku/uMtSx8aOmYsKeAyv9YxJu8z02br3nUw==
 -----END NEW CERTIFICATE REQUEST-----

test-secrets/create-certs.sh

@@ -5,6 +5,10 @@ set -o nounset \
     -o verbose \
     -o xtrace
 
+rm -f kt-test.*
+rm -f kafka.*.jks
+rm -f snakeoil-ca-*
+
 # Generate CA key
 openssl req -new -x509 -keyout snakeoil-ca-1.key -out snakeoil-ca-1.crt -days 365 -subj '/CN=localhost/OU=TEST/O=KT' -addext 'subjectAltName = DNS:localhost' -passin pass:ktktkt -passout pass:ktktkt
 

test-secrets/kt-test.crt

@@ -1,19 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDBjCCAe6gAwIBAgIUQLTARfFpFqJ02GybrjTPme2jKzcwDQYJKoZIhvcNAQEL
+MIIDSDCCAjCgAwIBAgIULxF6KJKCcA9Uqd8v73k/6ZoJgckwDQYJKoZIhvcNAQEL
 BQAwMDESMBAGA1UEAwwJbG9jYWxob3N0MQ0wCwYDVQQLDARURVNUMQswCQYDVQQK
-DAJLVDAeFw0yMTExMTgyMTI0MjNaFw00OTA0MDQyMTI0MjNaMDAxEjAQBgNVBAMM
-CWxvY2FsaG9zdDENMAsGA1UECwwEVEVTVDELMAkGA1UECgwCS1QwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9SK4B7cRCRdz69snq3ucd4oo0eqFvXYfO
-iKfGAcAtGc4rhmqBYYILvZMKqE+SWWQvz0k/vZ/S3UpvSSdYH3gducJ235Durqn5
-5wzEoRvoZnDBB97b23mWrbmsLnzhQ+4pfLJ5i4k95H+Uv43fagj2fiKIBGnp6WW0
-5w8zpI/98/bEQpR49U87m2oEQ+SAymRN3kSbNjiCw2JAbkfWBbAPatp0TRwVJp37
-2/X0G47EmMuWssZwVips7M0b5sncoRaz+Mx82N50H4eDydGxRu2hy5TJsi1VrlEH
-IS8wKsIIrROuhuudQUb4EGtZmMWBdoT9DLELOtRukYJVtoxOx2a7AgMBAAGjGDAW
-MBQGA1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEANidhoETV
-/wTfQOs2b8boTd8O62YCtCCFowgzzUYt/dDGE6s5bZN7zzZ6kz7TFuIoVvsedXzu
-RZDkzpBfPu1v0drAh5J5RnFnyv8sx6OctN6Z0LtwxlNB5hbheMqhLa6XLQttzgLB
-pF5H7n/eE5C5z85OITIgOc7K8ZIW0NVDlpsbAeGtaxSV2E9Vc5p1/QdYkJfHBQ7G
-yuVj49XhMjgWtNZKmGabmoLLeYMbZBjDCIAZzvbjnnismFq+JIomkAaqHaAqtfuq
-pEAsoJfIbkFqasfRpa/13LCSRCWuS5pbaqx23U6SXUiCGHWSflvFRocfVcECahnr
-XynNQOAi5VWPTA==
+DAJLVDAgFw0yMzA5MDkwOTI0MzhaGA8yMDUxMDEyNDA5MjQzOFowMDESMBAGA1UE
+AwwJbG9jYWxob3N0MQ0wCwYDVQQLDARURVNUMQswCQYDVQQKDAJLVDCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMWUZ/gXqWddzVsm7t5k5kscMpELT2/s
+CS8j7pYvujpyGh0Ehv/kbq9ICo87bj2LbpZ7bfOR+Mzq+8kfN97pYvT2m3A85nWx
+ANLExvLuVr5psFUG61I12TvfOI+YxtX2zmy3KgJyiP/ijQC9580V3d8iZfCQtw06
+Q31SQcRycnQYjpRisMKZAtbO3j4IfENVpuEUo7Fv+vv8mQJ2wEVtgCoG95P5UvFb
+UsVil7dr0d8qsdiF5oIacR0FlTErVE/PaIwm1X/jg39MQ6TKfi9pqQ+nMaLBGeHB
+QqOVIOMvN9TjgbJXiIaUY+uRCJyGYy5Dc1ZTiVS1vr2DLDO9LPajelUCAwEAAaNY
+MFYwFAYDVR0RBA0wC4IJbG9jYWxob3N0MB0GA1UdDgQWBBROxHij48253g4hpWAe
+1kW5HqhUczAfBgNVHSMEGDAWgBT++HPCTDT9gxL8o1n+K5EtXs9epzANBgkqhkiG
+9w0BAQsFAAOCAQEAK4zIgCsN9T7pcEhZr+sEuXgjZjfs6xLmxriE3jgWEGuR1wd4
+L5NV1usCbDI4wl/9RhMZ0+CnZvnqKgP+CiI6T93aaUMyVEQa2BCsz3gr81KGH/Ha
+x5oqMTLUyQgphotOK9Sr3Z5WCN3t8kqx1uJsgetQfmsX3FZ8ADgdABelPZBDgSEC
++UX8pGKmHWF4eUmkHv58TJZX2vcD8eccsffXbdUZzxxCsnmqveIzNYHpwr1n/s8V
+asPGatsOYGD9emkhRstod48WPXWI5ld9fB1BpL1WIerXBHchk5GQZuZEVWZzXuC4
+GyXiFNgL2YNURgKKaNb6hJEEBKpWfX8doYzylA==
 -----END CERTIFICATE-----

test-secrets/kt-test.csr

@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICnDCCAYQCAQAwMDESMBAGA1UEAwwJbG9jYWxob3N0MQ0wCwYDVQQLDARURVNU
-MQswCQYDVQQKDAJLVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1I
-rgHtxEJF3Pr2yere5x3iijR6oW9dh86Ip8YBwC0ZziuGaoFhggu9kwqoT5JZZC/P
-ST+9n9LdSm9JJ1gfeB25wnbfkO6uqfnnDMShG+hmcMEH3tvbeZatuawufOFD7il8
-snmLiT3kf5S/jd9qCPZ+IogEaenpZbTnDzOkj/3z9sRClHj1TzubagRD5IDKZE3e
-RJs2OILDYkBuR9YFsA9q2nRNHBUmnfvb9fQbjsSYy5ayxnBWKmzszRvmydyhFrP4
-zHzY3nQfh4PJ0bFG7aHLlMmyLVWuUQchLzAqwgitE66G651BRvgQa1mYxYF2hP0M
-sQs61G6RglW2jE7HZrsCAwEAAaAnMCUGCSqGSIb3DQEJDjEYMBYwFAYDVR0RBA0w
-C4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQCCr4wpCaFQolGsIxUV6K9p
-gIVsxCT3GGMaW+xulH+q+UV+VVH9CAkbkL7BJZ75HEsmJs2foZrI63aiS0QMRc0M
-QL+TQC0c2m/c/1ck0gsiIFdG8umUXkkQDvffrYW/o/Lz+hUcfsAhBXGWKHh+1gki
-xbk3+0EH3GubTYhADaOEPsemc1rnqp4FFGJ82fPqHpMXZKVoet8alyygp/rVpQ+V
-460r51vGNRJFGmUp5MUBRDGAsVJa0YhR7UE0GiUQXom90mcYLRwjHt2XXhQwvJua
-ek2WfBxfKrugH5DrI2byPanVrtzA3mWOLhosFGgNK59pKVZTqqnNSwUJpw+vKJxI
+MQswCQYDVQQKDAJLVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMWU
+Z/gXqWddzVsm7t5k5kscMpELT2/sCS8j7pYvujpyGh0Ehv/kbq9ICo87bj2LbpZ7
+bfOR+Mzq+8kfN97pYvT2m3A85nWxANLExvLuVr5psFUG61I12TvfOI+YxtX2zmy3
+KgJyiP/ijQC9580V3d8iZfCQtw06Q31SQcRycnQYjpRisMKZAtbO3j4IfENVpuEU
+o7Fv+vv8mQJ2wEVtgCoG95P5UvFbUsVil7dr0d8qsdiF5oIacR0FlTErVE/PaIwm
+1X/jg39MQ6TKfi9pqQ+nMaLBGeHBQqOVIOMvN9TjgbJXiIaUY+uRCJyGYy5Dc1ZT
+iVS1vr2DLDO9LPajelUCAwEAAaAnMCUGCSqGSIb3DQEJDjEYMBYwFAYDVR0RBA0w
+C4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQBuLVaJnFEfv4JVqeoNTOe1
+YNe/hHyVtCkv/f2xt9sPvGnUmV1j15j1G1O3MUS+vf01wfRaHabFqvmd1KFMQHrN
+fMaWGTYcdX0Sus8OJpNRVpqu7marAkLVHs2w2GGmicTd4sZa0Q5Ik7r8J3o6+drS
+4TYK+33TtK/ujp67ryYEDypl/eh7sIUGLNlRjCHvX14k4nGyL+GYiOZ2rnoO0K75
+oWYutCVbtCrtC08bLFhSPmCkWCH3lPIP+sZIYncQyQ2eyyBvEqdI7ypySRDujkw2
+cWOHMc30WJ0NJry46o7Nd9TofK3LAdNGxwDNk3BQYW9Z9kvXOI6Ea5frYVCGIEv9
 -----END CERTIFICATE REQUEST-----

test-secrets/kt-test.key

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAvUiuAe3EQkXc+vbJ6t7nHeKKNHqhb12HzoinxgHALRnOK4Zq
-gWGCC72TCqhPkllkL89JP72f0t1Kb0knWB94HbnCdt+Q7q6p+ecMxKEb6GZwwQfe
-29t5lq25rC584UPuKXyyeYuJPeR/lL+N32oI9n4iiARp6elltOcPM6SP/fP2xEKU
-ePVPO5tqBEPkgMpkTd5EmzY4gsNiQG5H1gWwD2radE0cFSad+9v19BuOxJjLlrLG
-cFYqbOzNG+bJ3KEWs/jMfNjedB+Hg8nRsUbtocuUybItVa5RByEvMCrCCK0Trobr
-nUFG+BBrWZjFgXaE/QyxCzrUbpGCVbaMTsdmuwIDAQABAoIBAH59GiMZ06QB8ckX
-sBkvObzjzT2CkWzNUNq4wXz1YIoDC55UZcnt8iyMU720efAvol68o5Nf0XTlAj/Z
-39vos6kRoJ01izGlMNtaBlND4lVsV373FntPcDI8B67DJhqW/Yll1hKZJ25fys4J
-L/KTdkfaRJMmd+yjVp8MJUF6f+rQu7YG/Z4kIqjyB56nq9/3aZuYYyDpzuAxuVTr
-tNIq5RRhmtLA4JZ3/LG5FJmi7ONdDdmRmMzszjDwT3nTw16oIykmiAmijNqsz+AO
-ET1YllExu+63UFCDdRoidFUqDxV27IbWQqVnKiK2eKgm2veA38kyUQnzdNfsy7Fu
-yKDqGTECgYEA+Mq7ghaCjeKqDioyTUYWipUXqsdrsfodSlechl7B0N8MYcHkuqyV
-/F+VBTqE+qQ3wIwPeKqsyHRHXFxFI09OzvO269TzGTwO0nRenmGubkHu+CYzJmSG
-hw0t1ZZDiWYAYxTInak6TLtAdpyjiPkk5GaiKhaLoAIBCG+lSrqpp4kCgYEAwsSU
-4vi8QDdDadd9OyGMTApguQXFES/h9YXfr9Y7Phfv4X9NkkkqdtLeZ6VQL1+KBKwY
-7c+K7ulehvpV54/y6dM+u0v8k4sYcwCAZ+fSsk0Oh+560XgaohhxX9umcN2DtSrP
-cMDCGojAnw7m36KSURtmE9KqwfN5C0vW0zUKxyMCgYEAxyv15PUEW3ZkUaayUm6T
-ySoGom+35emn3UY6RtBBNWf7T5+b714PTNVwRZlNsCIbiAgYsq9gV7HPFz+/Eb+C
-BefSPwZh/4e3DgCfZwgoTph2KS7bsBa2JBQG54C+XJbOJIQU/zLlO1yFBO/tc9CR
-GlCX7j3SVayFCy3mE+dPvpECgYEAtY+Vj2P58Q7TPAZSSl4CsBv4gGIdi+EMDdmn
-ZP4bKc4coyQOBvFHsY7vHsVfU1oHikV307BmPkK0CLWygPOSqWBwGR9Dq7K9ru7n
-xHS519a3VgX83enNQg/xGD/lD0+f6LGowN4f06ZpkZzNoeml5g/Zf18iKT0zOFGR
-SEAo9OsCgYACNMYSD6X0xTBwI0f/MRLElB64RGjFk7d4yKKBMQQebzUJYqkT/G2T
-F9eQJnE4GSLYUNfOM/2OikIS94vEyU7SpMcCNTpvMyFFlejA+95EhugGM5Ll5shM
-tags0wtiouEpMOqquG0IVyyH37BarufTjuqUvJC8oV2iHMRS8TFcMA==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFlGf4F6lnXc1b
+Ju7eZOZLHDKRC09v7AkvI+6WL7o6chodBIb/5G6vSAqPO249i26We23zkfjM6vvJ
+Hzfe6WL09ptwPOZ1sQDSxMby7la+abBVButSNdk73ziPmMbV9s5styoCcoj/4o0A
+vefNFd3fImXwkLcNOkN9UkHEcnJ0GI6UYrDCmQLWzt4+CHxDVabhFKOxb/r7/JkC
+dsBFbYAqBveT+VLxW1LFYpe3a9HfKrHYheaCGnEdBZUxK1RPz2iMJtV/44N/TEOk
+yn4vaakPpzGiwRnhwUKjlSDjLzfU44GyV4iGlGPrkQichmMuQ3NWU4lUtb69gywz
+vSz2o3pVAgMBAAECggEAA/YEVpSiMO5lg72bqGLlSnoHKEVqTdx4kP90OGX3RitL
+0nJh3z/vtctFMOyGrGV32FkxLj9N1iKGMop8ptcV6DRdyI1kAQ6+AnSZ2MrGJkB9
+VpPurvdFHykhKfZCC8bMNK9czppdY5ZTfmTzzq+NSjyI40IsyqEDQcAtDYbOLhnJ
+c5I6QYrRovviqR+MNiFdkhIdfUatcDVHYWiyPBlSr/Q5NPFw2z/JQGiVHlAnZCFs
+coJPKDNgDA5Xgo/1oMI7j63PpUU0cxdl0MpNtsf4PzmFmjRhLlSSOvjZNSqkIetJ
+VAqWknsuM4m79/ZR9D6heOzlHdZPuPPTZXqe6mbyAQKBgQDv2me0QbZ7fytmrjoQ
+aa4rGbgS4/GMEiPK17IVo0NlIdMLAuaEVZnBBiPuFNDLY25bh5T826Z7VT0YWbO6
+hLZjzltve8Bj1TRHmOuYPJs2DYMuWl/qs6bFNU4ZYnYvrEJwRlxR4s39ZPLaUKz/
+M0XBul1YSUwQYAwBN4GXC0ekVQKBgQDS4Xd6RFldqCCKYP9VKiuEZZgXDmYpB40O
+35HoiAs+GVbtVHE7iIqeCHldjVYD/22HU9oGHKnwKjk0Kq13LTPbDmYbis9eG9vv
+pdtNuD2/0iEUniRqLsu7xHszutZ+IaFqOqnsqoYSQYDqMocnrIcIqs0b3/XGNvle
+1KHpMJJ+AQKBgQC/ned9nYXwsY710Dj5BcSsEDb7eHlvospPcfSGztC3ycb1pBKP
+JGfaSlKIEL8hzcTLgMypGb2uCFHv0zH/z6h6odBwhxgTabADhwqoq7p/+1mSvYal
+VXLlWAmVxBCRU3gchEma7awNRQmzGgKrOsX+2Clcr+oBpwnQKwzvo4ZPpQKBgEri
+6FPR+85Hiy643VN4AzYkAcuGQH8ngE8c06q4zQ1DYFwtVXyns1oFdlvjef03csTQ
+4Sa0fSCdTe0Zjro4oiaTSW1UcOlhiUvkISnLWJpK25Z/xjyy24SVdI7dNZhbBwA7
+TuaNc8j92/LO+LH9EYLhbK8ObC/0i7/CULEHn64BAoGALoZhyoww72GZhDnK7iOy
+4BA6hffMrg0TSTr9w5WKLiZ5cCreTt4FwycyyCJ77k3J9W8yVo6t1GQ/5185befI
+1H6NuJFVzQwweEPxNw66rNBbg+0CO01lZx2BGw5FB6dbaDrNrWP2lgSeXiihtJDk
+y/zSwljPZCDAsp8Tscsw9OE=
+-----END PRIVATE KEY-----

test-secrets/snakeoil-ca-1.crt

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe/TN9DjOojmoMCxeeHjrLjmZLKw35AVPY
+AUT9nk2fUKLFgIY6QgXQBwcMh8hxAGiINkKyHHW+dlNeTY072b/e6bATqSJlJmgW
+WvrYHvV/2pOe4yuIbQmKM6/Cc701wtF+WqYAM5puOq6jpBrnbI/PiewVGAL/DH7q
+/aISej4rrUJ69NKx/d66Gp6ONcUqNlXKDOXDvV2hAXcJMKGVOmDj71rVNFv6QIPp
+w9gGUaOzS4MCafGmrPNxQ+36iHaH6OluMxwOLX/OHQrD0KbgrW1aaBCbUrz7E0iI
+ogcUsOKqT079Ta3c01lcHa55/MU/5dsTzAYn95yxwOlTxH9//wCJAgMBAAGjaTBn
+MB0GA1UdDgQWBBT++HPCTDT9gxL8o1n+K5EtXs9epzAfBgNVHSMEGDAWgBT++HPC
+TDT9gxL8o1n+K5EtXs9epzAPBgNVHRMBAf8EBTADAQH/MBQGA1UdEQQNMAuCCWxv
+Y2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAGJrLlUNdnCZcXkEmasJXkAwdmTKA
+9RJDMH2ElLlWP+IFzCDtoqyI9WjiyZsuo3mDUshu+YZhZ2362oW3gfdCvocTqKuh
+LsUXnyvKy30VZPxhsA18tzbcVElbUToPY0uNtnLGQ0yfEeYch53yvbmTq3zJTwP0
+SLYWKbwM0Hpt7MpvwwDVZfzIZ2NNS1pHWOPKtXaB+6c0kK3VLFYrCihw5ID1zzhJ
+CxI5DXbIRhdsliXp4ZTHpG+I/cX+3pA2AukQByKtqUgigR2bJIH4edhpQGvxe0B4
+89hLL8iNroa+9lT97O9ECDBKoMLj9YcN8YCsvjjc7wt2C9GoxAzutFsSTA==
 -----END CERTIFICATE-----

test-secrets/snakeoil-ca-1.key

@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIIRv5EihzOf4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP3WKRr/LDp4BIIEyGdYtrDZ2O33
-uWN539uy8cTCqcbwwgvH/0zYOqacKDvf6wAHAPI24lTIqo9yct0uv10j3sVSnQPe
-3bcB6jZ90r9nLsKgUZG6RJB/JEDIgVt1VNyvSuc1dez3U2ypSRtqcDIYKcctRL4v
-sbB1nOhMcF6gEHaRtI3Sggmh1QmJKK0fO9r6F7GCviF3ku9Ftv+EViJVcWC19HH/
-/aFWg/E44uGLvZUALVnq+ZeyiEFmWtVPKz9rFRjNnvoNw5LTJXV/wNBvSU/YpwRP
-Z2Ct/89YTpMqRVwxWKf1rU0hMujbIBP43pXZwLioAZ7Gii6eighNYwxgLflv+0dX
-4UL49380DPU7TIZaOcTjviVI4U0aTA9IUjNPYNY9qUSwyIo9nr4Uqik5nMLxN6nD
-p5q9wWwljrSn+L7S27X853n0a1pqQGavLOHw2Zb1RHoymFFVyV6WcW/eJk3An2t4
-Ua1yKLVuIPZCaV1SQ6Ey2X8XjDUnNkXnYhrZlEv/BWO/hmx5KqMHyHu39WsEq2it
-9B6DEmQ0n1+fZJAoD6Uu+QVsry9rRzAL4esGOty4npixr8XtGcNcWqrSlfuulPDy
-MJdP2eHh5cVKbUUTKkCy0yscCzvKQsadc5fgQAKWJtQsvvinWf//N2pXOgXStnu/
-KAxlC5pE8scnlqUcxfucrhmZuqLfJQep9WOrmc+815u37lFezwCfgrQtl2hB+kcR
-79JvCqLjtLcUg+boaa+Q2bN2V2OcoWpcy53z3yDi44yUFh1jnE+Y57J1KBm1AU5I
-CTTrtVttgUDESKJ4Nj8HSMDxZ5px8sJ+a476R1vwm28N3G8Irp4CLXHrstOAfleO
-E0aGCKpPS3ai9ci4sUX4IQtoWS2CWjwRKBwvz10zJdS0/F5J+fsIKHE3i09GH3SJ
-rLy4177KpswrUwsSAjCPjXtf9uP57olR2WfS+GLfH0i9V71B1NqMdfpqt/Kg8qJH
-/8nnq/C+MMmX/BBDkvyETIg0ene/rweswu+q1P26Px7g0EwKLhjNNZ+esNPAMK4S
-RapRu50nkVqXvM0DISFqCG5RniaQ+TqXc8DmYo/v6qUZgoabuErCEUJ9+kA5Ylur
-R5AltxodpFAVhjlbZLkFEAPsNaykr/RObb0AmQOzPofbL4zhDWhjoY5JiiuZIm4N
-Ya3NG3wR/3UnGBZWjQPcrMTIRu22ynawKhXS5ne2F9xugMg6LV2Ju6YYeB7SEdjE
-IiJZlWyMeYsHIkvutgqc55hsVVWkQt6SLZgR5h9A8GHm34O6TqR8Cn8zUULHy3MV
-uKeyGwKhFMKIuN9sQERrE4To7HCdvUhds27UZGgKdacLJcfKSmHlXGSb3Jrz1e/L
-0MHhE8Yp9haky7/yKDt+qTXh4fdGNWGVN8LLB3Gmdx6o7JCllIwRpf2JjKiuKW8Q
-3yjtNteWM59Tc6eo0EEGSj6RV17iwI3oaJOTPsFa4T6bcivpvAzAfFSNXEh1oy54
-g8Q67mYCfu6soYwCrSsvNw/K+Dt6qDY9f/0KoMlbl4N4bBn4JIjo0+gfIKGd7XtR
-eOFhOe0MwUltgSycXtIa+1W3N570sI2e/JoLHQT0aUVL+8ef4swGBcx1PQkKZ967
-CHsi4Fjvaqvc5ZFkPjjbZQ==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQISTm/5y6Y+fcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHHoLuMkCMfJBIIEyM5sggx1BvrV
+RppMyoQpWQ9ZTRHnmZTESwyIYm0Pn7ycpxSv/x9eKYwclRP0nKW/8xsBwImYoO1q
+V3UBTCBYU3OfBn6GbFzO5ajXWwJa48NiAkjZ3UxycsCjJAWFVOHxAwWiUEbmO/52
+RoBlcAW2TuNRsMwBoZDMkky3YQr5VlSJaFKBXAWItr1XAPWECNVzXwIJVus3qFic
+nYYhCYpunDIfWSlqjYjU4vQ946qvOY1yRU/dqTYYA+g3jHqDiW4sQhZocELqiLkR
+aLsr+BUWaazB56PHvCNhmy21xUP2Ts2MiIbctXtpOtMFeYTNXqdisZhO0iJaRr0u
+g0e1ilnzWypMigmmZwvZnG0lKN2qNS5Vl4lNUmJ3TFXVYmgweiryherqdzA0J9jS
+hDBzwfGCWbAprt/HHliknssUnELTM6Ij0i0lyf6q/z1Ol/y0pwSmHUjx2CHHF8z1
+LSNdf8HTY8ugyGoMCFxDIenFDNzfT9ZRrE3MW6H4zcctxHnpy0r0O3FZsIpJEhqC
+bpkAyLYn0KQyP97HpcJ4kterI3iOVisQE26nI7dB4SWZs69Pu6TCLqQQfSQqF/hL
+e1ZH2VsJ7v/lQmBYMY4PlcygkrjL3DQMSAUzyJI50do9Wd61J6OtQ+ib8E8yXWBF
+ORGH1KXoQT2U4vQ8M8Y6Pco0b2pUV4JHQz0exygUi9QrLGpw4nh6jnJcDsWhy9Dn
+C8fn3PWtkzsrndq+yO3VNKOxvJKj4ESb6C7UtxK5vArqinLhM1CREO12kyS0593q
+I5VE9fWavI7NIBnzRhBVz5Wc66KllKTssDQgDH9M/HINL4ggc4vzHGwc+tKMLwL0
+RQqf5Q4YuCgS817vK5fhMvfoz+GiokG7UNwEUuIxG8ujB2ZGIdNtEA8Z6s8Rix5o
+EZvCR55waWJ4z9k8qEL5CL7OoOMiJ6hxOb1C3wNXHPH6goegd9Ll7dS83oA/zWVP
+DyxQjkuwQJsMibzb3dFEcZbwZC9P2dDYjVcn+jwpVSkObOmtkAU59PFtlHYwz36v
+vHS1UJ/5Z2dNtFSNR2AhZ8meFyDOQynmUKxDXtsTX3onYX6nmKvnzfyN/B4sClWe
+QXxKbGN3QwEaahSXiGEDeJr9ToBl8xv1MAKXygM0F6UT/BVm/7Nc88E9GFHpzzPC
+spHzQS0VohvCTGx6gjv0boIwX74CRd0HW9h5WIOf4VJJeXjDMJ1ODY8a5hpxocgm
+m2lNnO2Wn+enh6DSGnSEcSGiH1qPcZSeokuKdMDkFaPr6NsCx6WMOt207LyWyC2S
+VfazWiGgq9qEaSs2S40PECCykKJtRMm+RsxPZOcpjIwZjsSmT1UszxkqNkpXeaWR
+aXFePr2o/7BjrFb5f+5yMzD+1GWPcDjflMh/v9uCq8zyU0UvdM3UF3my5a/h9ItJ
+JwnqsgroOHRlecT0a6KuDBTfoZCm8bLy8elvatpcwEkYccpmflbCy3W1TkEBeh7D
+wavUT6FJcfOejYV4iPj22R7nFBKVHbSbhOjua0iEVs21ZjBlrm6dmBvXwjz6ufNZ
+6eH9nXyO0dGS9i65T3mx1AlorfR9v73m/elkvMEs5rIdOPvLIOhvzMyN15PnAgEj
+NqEt1wSboT/b2LB+dyELLA==
 -----END ENCRYPTED PRIVATE KEY-----

test-secrets/snakeoil-ca-1.srl

@@ -1 +1 @@
-40B4C045F16916A274D86C9BAE34CF99EDA32B37
+2F117A289282700F54A9DF2FEF793FE99A0981C9