test: update certs for 10 year expiry (#19481)

command/connect/envoy/envoy_test.go

@@ -137,6 +137,22 @@ type generateConfigTestCase struct {
 // the logic is. We also allow generating golden files but only for cases that
 // pass the test of having their template args generated as expected.
 func TestGenerateConfig(t *testing.T) {
+
+	b, err := os.ReadFile("../../../test/ca/root.cer")
+	require.NoError(t, err)
+
+	rootPEM := string(b)
+	rootPEM = strings.Replace(rootPEM, "\n", "\\n", -1)
+
+	b, err = os.ReadFile("../../../test/ca_path/cert1.crt")
+	require.NoError(t, err)
+	pathPEM := string(b)
+
+	b, err = os.ReadFile("../../../test/ca_path/cert2.crt")
+	require.NoError(t, err)
+	pathPEM += string(b)
+	pathPEM = strings.Replace(pathPEM, "\n", "\\n", -1)
+
 	cases := []generateConfigTestCase{
 		{
 			Name:    "no-args",
@@ -499,7 +515,7 @@ func TestGenerateConfig(t *testing.T) {
 				AdminAccessLogPath:    "/dev/null",
 				AdminBindAddress:      "127.0.0.1",
 				AdminBindPort:         "19000",
-				AgentCAPEM:            `-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n`,
+				AgentCAPEM:            rootPEM,
 				LocalAgentClusterName: xds.LocalAgentClusterName,
 				PrometheusScrapePath:  "/metrics",
 			},
@@ -627,7 +643,7 @@ func TestGenerateConfig(t *testing.T) {
 					AgentPort:    "8502",
 					AgentTLS:     true,
 				},
-				AgentCAPEM:            `-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n`,
+				AgentCAPEM:            rootPEM,
 				AdminAccessLogPath:    "/dev/null",
 				AdminBindAddress:      "127.0.0.1",
 				AdminBindPort:         "19000",
@@ -659,7 +675,7 @@ func TestGenerateConfig(t *testing.T) {
 					AgentPort:    "8502",
 					AgentTLS:     true,
 				},
-				AgentCAPEM:            `-----BEGIN CERTIFICATE-----\nMIIFADCCAuqgAwIBAgIBATALBgkqhkiG9w0BAQswEzERMA8GA1UEAxMIQ2VydEF1\ndGgwHhcNMTUwNTExMjI0NjQzWhcNMjUwNTExMjI0NjU0WjATMREwDwYDVQQDEwhD\nZXJ0QXV0aDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALcMByyynHsA\n+K4PJwo5+XHygaEZAhPGvHiKQK2Cbc9NDm0ZTzx0rA/dRTZlvouhDyzcJHm+6R1F\nj6zQv7iaSC3qQtJiPnPsfZ+/0XhFZ3fQWMnfDiGbZpF1kJF01ofB6vnsuocFC0zG\naGC+SZiLAzs+QMP3Bebw1elCBIeoN+8NWnRYmLsYIaYGJGBSbNo/lCpLTuinofUn\nL3ehWEGv1INwpHnSVeN0Ml2GFe23d7PUlj/wNIHgUdpUR+KEJxIP3klwtsI3QpSH\nc4VjWdf4aIcka6K3IFuw+K0PUh3xAAPnMpAQOtCZk0AhF5rlvUbevC6jADxpKxLp\nOONmvCTer4LtyNURAoBH52vbK0r/DNcTpPEFV0IP66nXUFgkk0mRKsu8HTb4IOkC\nX3K4mp18EiWUUtrHZAnNct0iIniDBqKK0yhSNhztG6VakVt/1WdQY9Ey3mNtxN1O\nthqWFKdpKUzPKYC3P6PfVpiE7+VbWTLLXba+8BPe8BxWPsVkjJqGSGnCte4COusz\nM8/7bbTgifwJfsepwFtZG53tvwjWlO46Exl30VoDNTaIGvs1fO0GqJlh2A7FN5F2\nS1rS5VYHtPK8QdmUSvyq+7JDBc1HNT5I2zsIQbNcLwDTZ5EsbU6QR7NHDJKxjv/w\nbs3eTXJSSNcFD74wRU10pXjgE5wOFu9TAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIA\nBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQHazgZ3Puiuc6K2LzgcX5b6fAC\nPzAfBgNVHSMEGDAWgBQHazgZ3Puiuc6K2LzgcX5b6fACPzALBgkqhkiG9w0BAQsD\nggIBAEmeNrSUhpHg1I8dtfqu9hCU/6IZThjtcFA+QcPkkMa+Z1k0SOtsgW8MdlcA\ngCf5g5yQZ0DdpWM9nDB6xDIhQdccm91idHgf8wmpEHUj0an4uyn2ESCt8eqrAWf7\nAClYORCASTYfguJCxcfvwtI1uqaOeCxSOdmFay79UVitVsWeonbCRGsVgBDifJxw\nG2oCQqoYAmXPM4J6syk5GHhB1O9MMq+g1+hOx9s+XHyTui9FL4V+IUO1ygVqEQB5\nPSiRBvcIsajSGVao+vK0gf2XfcXzqr3y3NhBky9rFMp1g+ykb2yWekV4WiROJlCj\nTsWwWZDRyjiGahDbho/XW8JciouHZhJdjhmO31rqW3HdFviCTdXMiGk3GQIzz/Jg\nP+enOaHXoY9lcxzDvY9z1BysWBgNvNrMnVge/fLP9o+a0a0PRIIVl8T0Ef3zeg1O\nCLCSy/1Vae5Tx63ZTFvGFdOSusYkG9rlAUHXZE364JRCKzM9Bz0bM+t+LaO0MaEb\nYoxcXEPU+gB2IvmARpInN3oHexR6ekuYHVTRGdWrdmuHFzc7eFwygRqTFdoCCU+G\nQZEkd+lOEyv0zvQqYg+Jp0AEGz2B2zB53uBVECtn0EqrSdPtRzUBSByXVs6QhSXn\neVmy+z3U3MecP63X6oSPXekqSyZFuegXpNNuHkjNoL4ep2ix\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n`,
+				AgentCAPEM:            pathPEM,
 				AdminAccessLogPath:    "/dev/null",
 				AdminBindAddress:      "127.0.0.1",
 				AdminBindPort:         "19000",
@@ -919,7 +935,7 @@ func TestGenerateConfig(t *testing.T) {
 					AgentPort:    "8502",
 					AgentTLS:     true,
 				},
-				AgentCAPEM:            `-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n`,
+				AgentCAPEM:            rootPEM,
 				AdminAccessLogPath:    "/dev/null",
 				AdminBindAddress:      "127.0.0.1",
 				AdminBindPort:         "19000",
@@ -976,7 +992,7 @@ func TestGenerateConfig(t *testing.T) {
 					AgentPort:    "8502",
 					AgentTLS:     true,
 				},
-				AgentCAPEM:            `-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n`,
+				AgentCAPEM:            rootPEM,
 				AdminAccessLogPath:    "/dev/null",
 				AdminBindAddress:      "127.0.0.1",
 				AdminBindPort:         "19000",

command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden

@@ -40,7 +40,7 @@
             "common_tls_context": {
               "validation_context": {
                 "trusted_ca": {
-                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n"
+                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEEzCCAvugAwIBAgIUIYIXKNRBFBPuuOit2D2CfVJAoDAwDQYJKoZIhvcNAQEL\nBQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy\nYW5jaXNjbzEcMBoGA1UECgwTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECwwD\nRGV2MRYwFAYDVQQDDA10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0\nQGludGVybmFsLmNvbTAeFw0yMzExMDIxNTUwMjlaFw0zMzEwMzAxNTUwMjlaMIGY\nMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lz\nY28xHDAaBgNVBAoME0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsMA0RldjEW\nMBQGA1UEAwwNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRl\ncm5hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA00iG5Iv\neRzZwf2P1Laih3eoiK2Wl1Re22cz2Pcpf6gb7agPguwU5Hco0DWzsnmek2Qyw9gl\noroX1t7LbTW2rxbK1hP7PkFCwSxi9u8MZDaLF3a79bwbsYZzf3toeoz8DCBxo9bB\nSSACj4uI/S+lUjMctQrK1nFjGoNUHfxioXPwIJH+TS/76TiZPu3Zj6kN6taVFNe3\nISBNXW6Vg8E3koz+9Bwv0a6Ty7oFRoJXpsud1k/83Iy288jhYDuB56+ypUmcCNqG\nT+e0Bn/VXHx26GXTx97cXSLJE+o+JrHZaI1TcQUL2Z5DJZVJRUg/wtcXggoMLVI1\nO0enJm2jdmLXAgMBAAGjUzBRMB0GA1UdDgQWBBTmrmqnZIdFOj6vhCUAJKLZNUDw\nFDAfBgNVHSMEGDAWgBTmrmqnZIdFOj6vhCUAJKLZNUDwFDAPBgNVHRMBAf8EBTAD\nAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB3j6gvalxq54hZSwVmVZPMzjdTVYRC11b0\n6C9pWKsLwu+WINcs59ui8wpYVjcw1AK4/2I1Q7P4RgpSarAxG5tYIMB1xcfFKqBn\nf/dDXexONgwpW6SoBJ58c7OB/aH8CenDT8Vwk3fwjYslOywbFRqBjH+PB8uTlu0e\nD1fzjpcQCrQeA5VD4pjJAaTmi7bLVuH5XIya3++f/N3xOn53GVMUDO1OdFz8ZMvJ\nWrrg7E/wMXB1b5Wo2n2ypVU4sejikSjg2nfdLojUWGMrZ8TuUnjFs88PeQ9CObAp\nA36dLfs4JLF3sVOtqTd6BGwegDsmmllYO5Ky6I+laoLSHpGDEihS\n-----END CERTIFICATE-----\n"
                 }
               }
             }

command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden

@@ -40,7 +40,7 @@
             "common_tls_context": {
               "validation_context": {
                 "trusted_ca": {
-                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n"
+                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEEzCCAvugAwIBAgIUIYIXKNRBFBPuuOit2D2CfVJAoDAwDQYJKoZIhvcNAQEL\nBQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy\nYW5jaXNjbzEcMBoGA1UECgwTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECwwD\nRGV2MRYwFAYDVQQDDA10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0\nQGludGVybmFsLmNvbTAeFw0yMzExMDIxNTUwMjlaFw0zMzEwMzAxNTUwMjlaMIGY\nMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lz\nY28xHDAaBgNVBAoME0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsMA0RldjEW\nMBQGA1UEAwwNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRl\ncm5hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA00iG5Iv\neRzZwf2P1Laih3eoiK2Wl1Re22cz2Pcpf6gb7agPguwU5Hco0DWzsnmek2Qyw9gl\noroX1t7LbTW2rxbK1hP7PkFCwSxi9u8MZDaLF3a79bwbsYZzf3toeoz8DCBxo9bB\nSSACj4uI/S+lUjMctQrK1nFjGoNUHfxioXPwIJH+TS/76TiZPu3Zj6kN6taVFNe3\nISBNXW6Vg8E3koz+9Bwv0a6Ty7oFRoJXpsud1k/83Iy288jhYDuB56+ypUmcCNqG\nT+e0Bn/VXHx26GXTx97cXSLJE+o+JrHZaI1TcQUL2Z5DJZVJRUg/wtcXggoMLVI1\nO0enJm2jdmLXAgMBAAGjUzBRMB0GA1UdDgQWBBTmrmqnZIdFOj6vhCUAJKLZNUDw\nFDAfBgNVHSMEGDAWgBTmrmqnZIdFOj6vhCUAJKLZNUDwFDAPBgNVHRMBAf8EBTAD\nAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB3j6gvalxq54hZSwVmVZPMzjdTVYRC11b0\n6C9pWKsLwu+WINcs59ui8wpYVjcw1AK4/2I1Q7P4RgpSarAxG5tYIMB1xcfFKqBn\nf/dDXexONgwpW6SoBJ58c7OB/aH8CenDT8Vwk3fwjYslOywbFRqBjH+PB8uTlu0e\nD1fzjpcQCrQeA5VD4pjJAaTmi7bLVuH5XIya3++f/N3xOn53GVMUDO1OdFz8ZMvJ\nWrrg7E/wMXB1b5Wo2n2ypVU4sejikSjg2nfdLojUWGMrZ8TuUnjFs88PeQ9CObAp\nA36dLfs4JLF3sVOtqTd6BGwegDsmmllYO5Ky6I+laoLSHpGDEihS\n-----END CERTIFICATE-----\n"
                 }
               }
             }

command/connect/envoy/testdata/existing-ca-file.golden

@@ -40,7 +40,7 @@
             "common_tls_context": {
               "validation_context": {
                 "trusted_ca": {
-                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n"
+                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEEzCCAvugAwIBAgIUIYIXKNRBFBPuuOit2D2CfVJAoDAwDQYJKoZIhvcNAQEL\nBQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy\nYW5jaXNjbzEcMBoGA1UECgwTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECwwD\nRGV2MRYwFAYDVQQDDA10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0\nQGludGVybmFsLmNvbTAeFw0yMzExMDIxNTUwMjlaFw0zMzEwMzAxNTUwMjlaMIGY\nMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lz\nY28xHDAaBgNVBAoME0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsMA0RldjEW\nMBQGA1UEAwwNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRl\ncm5hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA00iG5Iv\neRzZwf2P1Laih3eoiK2Wl1Re22cz2Pcpf6gb7agPguwU5Hco0DWzsnmek2Qyw9gl\noroX1t7LbTW2rxbK1hP7PkFCwSxi9u8MZDaLF3a79bwbsYZzf3toeoz8DCBxo9bB\nSSACj4uI/S+lUjMctQrK1nFjGoNUHfxioXPwIJH+TS/76TiZPu3Zj6kN6taVFNe3\nISBNXW6Vg8E3koz+9Bwv0a6Ty7oFRoJXpsud1k/83Iy288jhYDuB56+ypUmcCNqG\nT+e0Bn/VXHx26GXTx97cXSLJE+o+JrHZaI1TcQUL2Z5DJZVJRUg/wtcXggoMLVI1\nO0enJm2jdmLXAgMBAAGjUzBRMB0GA1UdDgQWBBTmrmqnZIdFOj6vhCUAJKLZNUDw\nFDAfBgNVHSMEGDAWgBTmrmqnZIdFOj6vhCUAJKLZNUDwFDAPBgNVHRMBAf8EBTAD\nAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB3j6gvalxq54hZSwVmVZPMzjdTVYRC11b0\n6C9pWKsLwu+WINcs59ui8wpYVjcw1AK4/2I1Q7P4RgpSarAxG5tYIMB1xcfFKqBn\nf/dDXexONgwpW6SoBJ58c7OB/aH8CenDT8Vwk3fwjYslOywbFRqBjH+PB8uTlu0e\nD1fzjpcQCrQeA5VD4pjJAaTmi7bLVuH5XIya3++f/N3xOn53GVMUDO1OdFz8ZMvJ\nWrrg7E/wMXB1b5Wo2n2ypVU4sejikSjg2nfdLojUWGMrZ8TuUnjFs88PeQ9CObAp\nA36dLfs4JLF3sVOtqTd6BGwegDsmmllYO5Ky6I+laoLSHpGDEihS\n-----END CERTIFICATE-----\n"
                 }
               }
             }

command/connect/envoy/testdata/existing-ca-path.golden

@@ -40,7 +40,7 @@
             "common_tls_context": {
               "validation_context": {
                 "trusted_ca": {
-                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIFADCCAuqgAwIBAgIBATALBgkqhkiG9w0BAQswEzERMA8GA1UEAxMIQ2VydEF1\ndGgwHhcNMTUwNTExMjI0NjQzWhcNMjUwNTExMjI0NjU0WjATMREwDwYDVQQDEwhD\nZXJ0QXV0aDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALcMByyynHsA\n+K4PJwo5+XHygaEZAhPGvHiKQK2Cbc9NDm0ZTzx0rA/dRTZlvouhDyzcJHm+6R1F\nj6zQv7iaSC3qQtJiPnPsfZ+/0XhFZ3fQWMnfDiGbZpF1kJF01ofB6vnsuocFC0zG\naGC+SZiLAzs+QMP3Bebw1elCBIeoN+8NWnRYmLsYIaYGJGBSbNo/lCpLTuinofUn\nL3ehWEGv1INwpHnSVeN0Ml2GFe23d7PUlj/wNIHgUdpUR+KEJxIP3klwtsI3QpSH\nc4VjWdf4aIcka6K3IFuw+K0PUh3xAAPnMpAQOtCZk0AhF5rlvUbevC6jADxpKxLp\nOONmvCTer4LtyNURAoBH52vbK0r/DNcTpPEFV0IP66nXUFgkk0mRKsu8HTb4IOkC\nX3K4mp18EiWUUtrHZAnNct0iIniDBqKK0yhSNhztG6VakVt/1WdQY9Ey3mNtxN1O\nthqWFKdpKUzPKYC3P6PfVpiE7+VbWTLLXba+8BPe8BxWPsVkjJqGSGnCte4COusz\nM8/7bbTgifwJfsepwFtZG53tvwjWlO46Exl30VoDNTaIGvs1fO0GqJlh2A7FN5F2\nS1rS5VYHtPK8QdmUSvyq+7JDBc1HNT5I2zsIQbNcLwDTZ5EsbU6QR7NHDJKxjv/w\nbs3eTXJSSNcFD74wRU10pXjgE5wOFu9TAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIA\nBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQHazgZ3Puiuc6K2LzgcX5b6fAC\nPzAfBgNVHSMEGDAWgBQHazgZ3Puiuc6K2LzgcX5b6fACPzALBgkqhkiG9w0BAQsD\nggIBAEmeNrSUhpHg1I8dtfqu9hCU/6IZThjtcFA+QcPkkMa+Z1k0SOtsgW8MdlcA\ngCf5g5yQZ0DdpWM9nDB6xDIhQdccm91idHgf8wmpEHUj0an4uyn2ESCt8eqrAWf7\nAClYORCASTYfguJCxcfvwtI1uqaOeCxSOdmFay79UVitVsWeonbCRGsVgBDifJxw\nG2oCQqoYAmXPM4J6syk5GHhB1O9MMq+g1+hOx9s+XHyTui9FL4V+IUO1ygVqEQB5\nPSiRBvcIsajSGVao+vK0gf2XfcXzqr3y3NhBky9rFMp1g+ykb2yWekV4WiROJlCj\nTsWwWZDRyjiGahDbho/XW8JciouHZhJdjhmO31rqW3HdFviCTdXMiGk3GQIzz/Jg\nP+enOaHXoY9lcxzDvY9z1BysWBgNvNrMnVge/fLP9o+a0a0PRIIVl8T0Ef3zeg1O\nCLCSy/1Vae5Tx63ZTFvGFdOSusYkG9rlAUHXZE364JRCKzM9Bz0bM+t+LaO0MaEb\nYoxcXEPU+gB2IvmARpInN3oHexR6ekuYHVTRGdWrdmuHFzc7eFwygRqTFdoCCU+G\nQZEkd+lOEyv0zvQqYg+Jp0AEGz2B2zB53uBVECtn0EqrSdPtRzUBSByXVs6QhSXn\neVmy+z3U3MecP63X6oSPXekqSyZFuegXpNNuHkjNoL4ep2ix\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n"
+                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIFADCCAuqgAwIBAgIBATALBgkqhkiG9w0BAQswEzERMA8GA1UEAxMIQ2VydEF1\ndGgwHhcNMTUwNTExMjI0NjQzWhcNMjUwNTExMjI0NjU0WjATMREwDwYDVQQDEwhD\nZXJ0QXV0aDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALcMByyynHsA\n+K4PJwo5+XHygaEZAhPGvHiKQK2Cbc9NDm0ZTzx0rA/dRTZlvouhDyzcJHm+6R1F\nj6zQv7iaSC3qQtJiPnPsfZ+/0XhFZ3fQWMnfDiGbZpF1kJF01ofB6vnsuocFC0zG\naGC+SZiLAzs+QMP3Bebw1elCBIeoN+8NWnRYmLsYIaYGJGBSbNo/lCpLTuinofUn\nL3ehWEGv1INwpHnSVeN0Ml2GFe23d7PUlj/wNIHgUdpUR+KEJxIP3klwtsI3QpSH\nc4VjWdf4aIcka6K3IFuw+K0PUh3xAAPnMpAQOtCZk0AhF5rlvUbevC6jADxpKxLp\nOONmvCTer4LtyNURAoBH52vbK0r/DNcTpPEFV0IP66nXUFgkk0mRKsu8HTb4IOkC\nX3K4mp18EiWUUtrHZAnNct0iIniDBqKK0yhSNhztG6VakVt/1WdQY9Ey3mNtxN1O\nthqWFKdpKUzPKYC3P6PfVpiE7+VbWTLLXba+8BPe8BxWPsVkjJqGSGnCte4COusz\nM8/7bbTgifwJfsepwFtZG53tvwjWlO46Exl30VoDNTaIGvs1fO0GqJlh2A7FN5F2\nS1rS5VYHtPK8QdmUSvyq+7JDBc1HNT5I2zsIQbNcLwDTZ5EsbU6QR7NHDJKxjv/w\nbs3eTXJSSNcFD74wRU10pXjgE5wOFu9TAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIA\nBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQHazgZ3Puiuc6K2LzgcX5b6fAC\nPzAfBgNVHSMEGDAWgBQHazgZ3Puiuc6K2LzgcX5b6fACPzALBgkqhkiG9w0BAQsD\nggIBAEmeNrSUhpHg1I8dtfqu9hCU/6IZThjtcFA+QcPkkMa+Z1k0SOtsgW8MdlcA\ngCf5g5yQZ0DdpWM9nDB6xDIhQdccm91idHgf8wmpEHUj0an4uyn2ESCt8eqrAWf7\nAClYORCASTYfguJCxcfvwtI1uqaOeCxSOdmFay79UVitVsWeonbCRGsVgBDifJxw\nG2oCQqoYAmXPM4J6syk5GHhB1O9MMq+g1+hOx9s+XHyTui9FL4V+IUO1ygVqEQB5\nPSiRBvcIsajSGVao+vK0gf2XfcXzqr3y3NhBky9rFMp1g+ykb2yWekV4WiROJlCj\nTsWwWZDRyjiGahDbho/XW8JciouHZhJdjhmO31rqW3HdFviCTdXMiGk3GQIzz/Jg\nP+enOaHXoY9lcxzDvY9z1BysWBgNvNrMnVge/fLP9o+a0a0PRIIVl8T0Ef3zeg1O\nCLCSy/1Vae5Tx63ZTFvGFdOSusYkG9rlAUHXZE364JRCKzM9Bz0bM+t+LaO0MaEb\nYoxcXEPU+gB2IvmARpInN3oHexR6ekuYHVTRGdWrdmuHFzc7eFwygRqTFdoCCU+G\nQZEkd+lOEyv0zvQqYg+Jp0AEGz2B2zB53uBVECtn0EqrSdPtRzUBSByXVs6QhSXn\neVmy+z3U3MecP63X6oSPXekqSyZFuegXpNNuHkjNoL4ep2ix\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----"
                 }
               }
             }

command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden

@@ -40,7 +40,7 @@
             "common_tls_context": {
               "validation_context": {
                 "trusted_ca": {
-                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD\nVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa\nBgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE\nAxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j\nb20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC\nVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK\nExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl\nc3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU\nmH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU\nd0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG\nxcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg\nU2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f\npFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID\nAQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud\nIwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT\nAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE\nChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10\nZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ\nAIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h\ngjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9\n2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g\njctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp\nlFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/\nPOLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r\nwlW975rYa1ZqEdA=\n-----END CERTIFICATE-----\n"
+                  "inline_string": "-----BEGIN CERTIFICATE-----\nMIIEEzCCAvugAwIBAgIUIYIXKNRBFBPuuOit2D2CfVJAoDAwDQYJKoZIhvcNAQEL\nBQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy\nYW5jaXNjbzEcMBoGA1UECgwTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECwwD\nRGV2MRYwFAYDVQQDDA10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0\nQGludGVybmFsLmNvbTAeFw0yMzExMDIxNTUwMjlaFw0zMzEwMzAxNTUwMjlaMIGY\nMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lz\nY28xHDAaBgNVBAoME0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsMA0RldjEW\nMBQGA1UEAwwNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRl\ncm5hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA00iG5Iv\neRzZwf2P1Laih3eoiK2Wl1Re22cz2Pcpf6gb7agPguwU5Hco0DWzsnmek2Qyw9gl\noroX1t7LbTW2rxbK1hP7PkFCwSxi9u8MZDaLF3a79bwbsYZzf3toeoz8DCBxo9bB\nSSACj4uI/S+lUjMctQrK1nFjGoNUHfxioXPwIJH+TS/76TiZPu3Zj6kN6taVFNe3\nISBNXW6Vg8E3koz+9Bwv0a6Ty7oFRoJXpsud1k/83Iy288jhYDuB56+ypUmcCNqG\nT+e0Bn/VXHx26GXTx97cXSLJE+o+JrHZaI1TcQUL2Z5DJZVJRUg/wtcXggoMLVI1\nO0enJm2jdmLXAgMBAAGjUzBRMB0GA1UdDgQWBBTmrmqnZIdFOj6vhCUAJKLZNUDw\nFDAfBgNVHSMEGDAWgBTmrmqnZIdFOj6vhCUAJKLZNUDwFDAPBgNVHRMBAf8EBTAD\nAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB3j6gvalxq54hZSwVmVZPMzjdTVYRC11b0\n6C9pWKsLwu+WINcs59ui8wpYVjcw1AK4/2I1Q7P4RgpSarAxG5tYIMB1xcfFKqBn\nf/dDXexONgwpW6SoBJ58c7OB/aH8CenDT8Vwk3fwjYslOywbFRqBjH+PB8uTlu0e\nD1fzjpcQCrQeA5VD4pjJAaTmi7bLVuH5XIya3++f/N3xOn53GVMUDO1OdFz8ZMvJ\nWrrg7E/wMXB1b5Wo2n2ypVU4sejikSjg2nfdLojUWGMrZ8TuUnjFs88PeQ9CObAp\nA36dLfs4JLF3sVOtqTd6BGwegDsmmllYO5Ky6I+laoLSHpGDEihS\n-----END CERTIFICATE-----\n"
                 }
               }
             }

test/CA-GENERATION.md

@@ -16,6 +16,22 @@ cd test/ca/
 rm -rf *.pem *.crt *.key && ./generate.sh
 ```
 
+It also possible for the root CA to expire.
+In this case, use the instructions [here](Instructions from https://langui.sh/2009/01/18/openssl-self-signed-ca/) to regenerate root.cer and privkey.pem.
+Configure the cert as follows:
+
+```
+Country Name (2 letter code) [AU]:US
+State or Province Name (full name) [Some-State]:CA
+Locality Name (eg, city) []:San Francisco
+Organization Name (eg, company) [Internet Widgits Pty Ltd]:HashiCorp Test Cert
+Organizational Unit Name (eg, section) []:Dev
+Common Name (e.g. server FQDN or YOUR name) []:test.internal
+Email Address []:test@internal.com
+```
+
+Ensure that you run `./test/ca/generate.sh` after recreating the root CA.
+
 ## Hostname certificates
 
 if tests like `TestNewDialer_WithALPNWrapper` (or any other test using certificates located in `./test/hostname` ) are failing because of expired certificates, use `./generate.sh` script to regenerate a new set of certificate.
@@ -24,4 +40,22 @@ if tests like `TestNewDialer_WithALPNWrapper` (or any other test using certifica
 cd test/hostname/
 # Avoid deleting CertAuth.crt and privkey.pem since they're referenced in myca.conf
 rm -rf "[Bonnie|Betty|Bob|Alice].crt" *.key && ./generate.sh
+```
+
+It also possible for the root CA to expire.
+In this case, use the instructions [here](Instructions from https://langui.sh/2009/01/18/openssl-self-signed-ca/) to regenerate CertAuth.crt and privkey.pem.
+
+```bash
+openssl req -newkey rsa:2048 -days 3650 -x509 -nodes -out CertAuth.crt
+```
+
+Configure the cert as follows:
+```
+Country Name (2 letter code) [AU]:US
+State or Province Name (full name) [Some-State]:CA
+Locality Name (eg, city) []:San Francisco
+Organization Name (eg, company) [Internet Widgits Pty Ltd]:HashiCorp Test Cert
+Organizational Unit Name (eg, section) []:Test
+Common Name (e.g. server FQDN or YOUR name) []:CertAuth
+Email Address []:test@internal.com
 ```

test/ca/certindex

@@ -7,3 +7,25 @@ V	180606021919Z		0F	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=
 V	21180418091009Z		10	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=james@hashicorp.com/O=End Point/OU=Testing
 V	21220322142538Z		11	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
 V	21221008151329Z		12	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009155124Z		13	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009165428Z		14	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009165428Z		15	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170507Z		16	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170507Z		17	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170704Z		18	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170704Z		19	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170742Z		1A	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170742Z		1B	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170931Z		1C	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009170932Z		1D	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171405Z		1E	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171405Z		1F	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171500Z		20	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171500Z		21	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171525Z		22	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171525Z		23	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171817Z		24	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171817Z		25	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171908Z		26	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009171908Z		27	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009172016Z		28	unknown	/CN=testco.internal/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing

test/ca/generate.sh

@@ -7,3 +7,7 @@ set -e
 openssl req -new -sha256 -nodes -out ../key/ourdomain.csr -newkey rsa:2048 -keyout ../key/ourdomain.key -config ../key/ourdomain.cfg
 openssl ca -batch -config myca.conf -notext -in ../key/ourdomain.csr -out ../key/ourdomain.cer
 rm ../key/ourdomain.csr
+
+openssl req -new -sha256 -nodes -out ../key/ourdomain_server.csr -newkey rsa:2048 -keyout ../key/ourdomain_server.key -config ../key/ourdomain_server.cfg
+openssl ca -batch -config myca.conf -notext -in ../key/ourdomain_server.csr -out ../key/ourdomain_server.cer -extensions v3_req -extfile ../key/ourdomain_server.cfg
+rm ../key/ourdomain_server.csr

test/ca/privkey.pem

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxrs6JK4NpiOItxrpNR/1ppUUmH7p2BgLCBZ6eHdclle9J56i
-68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsUd0HejRqfHRMtg2O+UQkv4Z66
-+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcGxcFZzTRFFZt2vPnyHj8cHcaF
-o/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvgU2jQuC7Fhnl33Zd3B6d3mQH6
-O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/fpFIIcHSiHRfoqHLGsGg+3swI
-d/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQIDAQABAoIBABreo6zj76p/8XM4
-a0GokZE1ZPR9bGawUYWFbIevM9CMCmI5+7M/RoHbBQJKDOapJsJviNkoSdpllxcz
-4CpFhXAiVNEPEeUoLU1EE4pJSSkxwcySppsiTYNFi5rMomgwe2qeuiKhgZNl/AEt
-82dubjwxW3QPgXHSWGjkfTht3wOhrczA8xyEjc9Bsad2ooA9IQk+VXYlPZXyXjs1
-WwLYHmcSfveauLliLXeVU2Ux5PPwyreKMhyAfSHVQCycxK008u8WPy8nkAlpxKMC
-UwCN+JKl69WCCA3CxXgM83zz4pXvB4EyMr8aTiqmOID8RIIrPcjCmVJki6KbJ9WG
-S2CQVG0CgYEA5kVACrnjLtov426ZNifF2zUXu9x//7D6GkbJxzZLwXP/BJFcEOdQ
-Fnjcs3s7wYh/wdTnEcQVWSJSAqnRt98c9yAXVnG5z1M0DYpAsY8xrdhEitxOf2oB
-2cbvi4+cvUuUxk1hgva18UCT23aLP+iY2+t/ydBXAZ9kq1zz5CcpEBMCgYEA3O/R
-g1Y9O36XxBmSYnkoCF5yGrPunnKKNBJc/WA7pTkQFYHr64Y/h5EKubzHD/VEd1Li
-nDuGYxVMewf+5pHUhqSdpZtTxv25hjOsqLf5o5wm18JThGifs2zEVCTJOPti5n2M
-RHakxuq1I625/QHidLBTQYuEBS/vywhapfaSaD8CgYEAhd1OPK4R30PiQRIjqXL3
-t9ampISsOKXWz33FgbUT1zOq1in23rDKQzYh/4ktlPXYZ4NwjUhzrKyiBoBYtc7T
-1OpoBs34Wgmhohl0QIThOZIXTq6CR9oFl2fqDDUBxp3wsFN905e+77A+BIBmtVFv
-w7GlSVp/qibSbDiOZF1LptcCgYB8sJBi+jnmqOSIVRJLpysTxhHJxkDmhahACRkY
-Gsau0cylBsUaEJMsNIyEFOmXtQml+k5QdDu9EdkvGm0evbDfKGqce1RF2w5okiNg
-uSwXzVoSrOartMxk2/7VqkkycpX3lWWjgf4vEWmXsEVmaDjhOF5UgKPKtao0wQs/
-3S/1ywKBgAIGgOuvL/GBcGqLikHLC+cputMvBAuE/tJnFHPxFoobskocVsMKbDTy
-NYF7uPlzSGGClZsjE6DQyyGf5E9/U+EdwDKZwHYGCkzVjplUBo0BT3EN0vcc9jB/
-ML9Ta4ETPyf66BhSVcD+eeNipPFAul0Q7uZhErH1zr1evTy8XXyI
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCIA00iG5IveRzZ
+wf2P1Laih3eoiK2Wl1Re22cz2Pcpf6gb7agPguwU5Hco0DWzsnmek2Qyw9gloroX
+1t7LbTW2rxbK1hP7PkFCwSxi9u8MZDaLF3a79bwbsYZzf3toeoz8DCBxo9bBSSAC
+j4uI/S+lUjMctQrK1nFjGoNUHfxioXPwIJH+TS/76TiZPu3Zj6kN6taVFNe3ISBN
+XW6Vg8E3koz+9Bwv0a6Ty7oFRoJXpsud1k/83Iy288jhYDuB56+ypUmcCNqGT+e0
+Bn/VXHx26GXTx97cXSLJE+o+JrHZaI1TcQUL2Z5DJZVJRUg/wtcXggoMLVI1O0en
+Jm2jdmLXAgMBAAECggEAPSMSwFKZVsp/a+h1g/nu8EapRDHPqWGzdIH1tUoA63/s
+vkUI5pQIb2m0oD1a7j+6yEtjXihHF7+6G24jrlgULV4thhZNXAFDT3DKdV+e2ziO
+hd4RqnJOUDpvf6odfDyd88u1p68oILCweUYxx+1axdqZi/1a8QsMY6ouvxhNcr2N
+MLOBMS9G/q4GKObggmTbBcZnZWYeNHqMv6CZXYlbY8NoOKiaI9Xw9dOQWKZFWgOh
+zdiLgUPRmeugOLfJWI2iqHHmjXzsz3tNT1B7TuD8QitSXmqvAfc/HD+QmOJOJVN8
+eB2+nqY1hoE8tsTGhZpmHFKAfg5glWcswblDxIG7lQKBgQC/37gpaJaGFA8k7tDr
+jrmvZXmPPozdj2kzio2GrYvEbfHBqWV7y9MapTIZjRURqa7rLXWtGYuv6+bLfwtD
+HrkDGWsjlrvkUjZXCqyYx1HfRAdEsMr/0kVqIVJaAO9kJJA6izno2XRpKMj6+sdk
+bGCbDveoDSY/vSWwd0ERqQFpVQKBgQC1eD7Ij96g2dJGQIJOQD1Efyxk9dJ+ocY6
+F+zZP7qgbED2nFysNtJ2wJyE6B4PnuUwpk5HkHuE+glgtcMUKsHPcynhaIRJBZfk
+UQ+GyCKQItPzT6wa8sQXMQvsIk2opwj/uGkJn1vZ1jPIdLCIqqqhcQ53dMSPgEkf
+PL1m4LmrewKBgDHgafL5qQc5d6ZWHiDdfQ9HBY5i6CNAAEzRm3CC9G4fVlTNQAAq
+P7oRbzCNKAjrXvjrXEee+FzGqbwETl0oQ1e2587chAMaC94cfDlKttGe0XTdsCdH
+9ZtdBhc3XwNdLdDKGEebH1OmsnfrcKF+Oq6T+XTJ1kODW6S/mz6H/EHxAoGAbsLr
+Bz2Q8/qfdpOvNRXOj31T2neUOAiD1jd+MAfO4FXSvPMpOU/o2+SqZBDNMFmaqDwJ
+sXKFgd+fU7D9VdTXIMi4+kTx4SQR1qCHaovDVNh9J5gsgvJEL6eXEFTLs7HoMzUa
+n23uASLVzncyvOf2Z716x/y0cKYre252aFGn4fsCgYA+003BZnT9kMj1gpd/F3JS
+JzFl10Yhj1hfyUu2pI6GLobj2VI3rEKL9UdzCTrEkLXyW1Js6DwT80mHIlJstzgZ
+hJsBus6mSap+IZi/hKLS+xgculy0xlXzwNMmEid8GyzSPoHNXRQ233nANjKaRuvT
+LG6wHDbfK+WVa3BlFKz8jA==
+-----END PRIVATE KEY-----

test/ca/root.cer

@@ -1,28 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEtzCCA5+gAwIBAgIJAIewRMI8OnvTMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xHDAa
-BgNVBAoTE0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsTA0RldjEWMBQGA1UE
-AxMNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5j
-b20wHhcNMTQwNDA3MTkwMTA4WhcNMjQwNDA0MTkwMTA4WjCBmDELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQK
-ExNIYXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRl
-c3QuaW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrs6JK4NpiOItxrpNR/1ppUU
-mH7p2BgLCBZ6eHdclle9J56i68adt8J85zaqphCfz6VDP58DsFx+N50PZyjQaDsU
-d0HejRqfHRMtg2O+UQkv4Z66+Vo+gc6uGuANi2xMtSYDVTAqqzF48OOPQDgYkzcG
-xcFZzTRFFZt2vPnyHj8cHcaFo/NMNVh7C3yTXevRGNm9u2mrbxCEeiHzFC2WUnvg
-U2jQuC7Fhnl33Zd3B6d3mQH6O23ncmwxTcPUJe6xZaIRrDuzwUcyhLj5Z3faag/f
-pFIIcHSiHRfoqHLGsGg+3swId/zVJSSDHr7pJUu7Cre+vZa63FqDaooqvnisrQID
-AQABo4IBADCB/TAdBgNVHQ4EFgQUo/nrOfqvbee2VklVKIFlyQEbuJUwgc0GA1Ud
-IwSBxTCBwoAUo/nrOfqvbee2VklVKIFlyQEbuJWhgZ6kgZswgZgxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEcMBoGA1UE
-ChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMDRGV2MRYwFAYDVQQDEw10
-ZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFsLmNvbYIJ
-AIewRMI8OnvTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADa9fV9h
-gjapBlkNmu64WX0Ufub5dsJrdHS8672P30S7ILB7Mk0W8sL65IezRsZnG898yHf9
-2uzmz5OvNTM9K380g7xFlyobSVq+6yqmmSAlA/ptAcIIZT727P5jig/DB7fzJM3g
-jctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp
-lFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/
-POLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r
-wlW975rYa1ZqEdA=
+MIIEEzCCAvugAwIBAgIUIYIXKNRBFBPuuOit2D2CfVJAoDAwDQYJKoZIhvcNAQEL
+BQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy
+YW5jaXNjbzEcMBoGA1UECgwTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECwwD
+RGV2MRYwFAYDVQQDDA10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0
+QGludGVybmFsLmNvbTAeFw0yMzExMDIxNTUwMjlaFw0zMzEwMzAxNTUwMjlaMIGY
+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lz
+Y28xHDAaBgNVBAoME0hhc2hpQ29ycCBUZXN0IENlcnQxDDAKBgNVBAsMA0RldjEW
+MBQGA1UEAwwNdGVzdC5pbnRlcm5hbDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRl
+cm5hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA00iG5Iv
+eRzZwf2P1Laih3eoiK2Wl1Re22cz2Pcpf6gb7agPguwU5Hco0DWzsnmek2Qyw9gl
+oroX1t7LbTW2rxbK1hP7PkFCwSxi9u8MZDaLF3a79bwbsYZzf3toeoz8DCBxo9bB
+SSACj4uI/S+lUjMctQrK1nFjGoNUHfxioXPwIJH+TS/76TiZPu3Zj6kN6taVFNe3
+ISBNXW6Vg8E3koz+9Bwv0a6Ty7oFRoJXpsud1k/83Iy288jhYDuB56+ypUmcCNqG
+T+e0Bn/VXHx26GXTx97cXSLJE+o+JrHZaI1TcQUL2Z5DJZVJRUg/wtcXggoMLVI1
+O0enJm2jdmLXAgMBAAGjUzBRMB0GA1UdDgQWBBTmrmqnZIdFOj6vhCUAJKLZNUDw
+FDAfBgNVHSMEGDAWgBTmrmqnZIdFOj6vhCUAJKLZNUDwFDAPBgNVHRMBAf8EBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB3j6gvalxq54hZSwVmVZPMzjdTVYRC11b0
+6C9pWKsLwu+WINcs59ui8wpYVjcw1AK4/2I1Q7P4RgpSarAxG5tYIMB1xcfFKqBn
+f/dDXexONgwpW6SoBJ58c7OB/aH8CenDT8Vwk3fwjYslOywbFRqBjH+PB8uTlu0e
+D1fzjpcQCrQeA5VD4pjJAaTmi7bLVuH5XIya3++f/N3xOn53GVMUDO1OdFz8ZMvJ
+Wrrg7E/wMXB1b5Wo2n2ypVU4sejikSjg2nfdLojUWGMrZ8TuUnjFs88PeQ9CObAp
+A36dLfs4JLF3sVOtqTd6BGwegDsmmllYO5Ky6I+laoLSHpGDEihS
 -----END CERTIFICATE-----

test/ca/serialfile

@@ -1 +1 @@
-13
+29

test/ca_path/cert2.crt

@@ -25,4 +25,4 @@ jctDlEGOmEe50GQXc25VKpcpjAsNQi5ER5gowQ0v3IXNZs+yU+LvxLHc0rUJ/XSp
 lFCAMOqd5uRoMOejnT51G6krvLNzPaQ3N9jQfNVY4Q0zfs0M+6dRWvqfqB9Vyq8/
 POLMld+HyAZEBk9zK3ZVIXx6XS4dkDnSNR91njLq7eouf6M7+7s/oMQZZRtAfQ6r
 wlW975rYa1ZqEdA=
------END CERTIFICATE-----
+-----END CERTIFICATE-----

test/client_certs/client.crt

@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICnTCCAkOgAwIBAgIRAO78TJMhBu87zWa1WjcG5rkwCgYIKoZIzj0EAwIwgbkx
-CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
-bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
-FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB
-IDIwNjQxNTYyNDA1MDIyOTg4MjQzNTI2NTMwNzkwODU3NzAyMzg4OTAeFw0yMzEx
-MDIxNDA2MDhaFw0yNDExMDExNDA2MDhaMBwxGjAYBgNVBAMTEWNsaWVudC5kYzEu
-Y29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEcSaUbB8GT/WlJjIvvbjE
-dgs7hEJqUrU5POXv8N9tNAe/FRbb1yBFU2dBrHgBlJp+sp0gp3cRUCzQMkLO5acw
-lqOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEIGV49e7k/a39oKuJCrdyF0Hs
-cgoZx+I2WwMGaT5soLG1MCsGA1UdIwQkMCKAIJqCAzNWlJBk68ytAJtnqLtvw2Vl
-lImVNZXwhWrSbD5wMC0GA1UdEQQmMCSCEWNsaWVudC5kYzEuY29uc3Vsgglsb2Nh
-bGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIhAPnAeouhL4lCbOuYj6REbJ2q
-WZDLv5j7AY5uXoLOtMgLAiALUk1/M2oUO1y61qTMLdCGQh3g6gKpSEB1vo/el1hQ
-VA==
+MIICnjCCAkSgAwIBAgIQAxVHhSG0wSbdZm+3ToYAkDAKBggqhkjOPQQDAjCBuTEL
+MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv
+MRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV
+BgNVBAoTDkhhc2hpQ29ycCBJbmMuMUAwPgYDVQQDEzdDb25zdWwgQWdlbnQgQ0Eg
+MjgwNzE4MDMxODA1Mjk2OTA1NzQ4MzU3NjI1MTI5ODQ5NDA5NjI3MCAXDTIzMTEw
+MjE1Mjk0NVoYDzIxMjMxMDA5MTUyOTQ1WjAcMRowGAYDVQQDExFjbGllbnQuZGMx
+LmNvbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKvl1yhbsI9r7IxJxLrt
+ZTNYXkCXuFy8q3gsokMqsl/MUynrIBrd9NrZEQA91ZArUYzF1+QlxM6D4hRJc5CR
+3x6jgccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCCvXve+zMFSJMXNS3l3YL9k
+2QH8zF74wa+TlwFSaQEjGzArBgNVHSMEJDAigCBGa65jF6Wwq9OmdbgJIRCYv++x
+HG8dRBUpwvSk0Mk1+jAtBgNVHREEJjAkghFjbGllbnQuZGMxLmNvbnN1bIIJbG9j
+YWxob3N0hwR/AAABMAoGCCqGSM49BAMCA0gAMEUCIBLqa1Zh3KUE0RiQzWdoYXkU
+wZo5aBw9ujqzLyAqxToFAiEAihWmc4r6lDYRR35X4QB1nTT92POJRClsfLPOTRG5
+rsU=
 -----END CERTIFICATE-----

test/client_certs/client.key

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILsRH87p2w58u2Re7XGAmPuI1grBy7ZMsxWDP7tJ/pL0oAoGCCqGSM49
-AwEHoUQDQgAEcSaUbB8GT/WlJjIvvbjEdgs7hEJqUrU5POXv8N9tNAe/FRbb1yBF
-U2dBrHgBlJp+sp0gp3cRUCzQMkLO5acwlg==
+MHcCAQEEINE2CQhnu7ipo67FGbEBRXoYRCTM4uJdHgNRTrdkAnHCoAoGCCqGSM49
+AwEHoUQDQgAEq+XXKFuwj2vsjEnEuu1lM1heQJe4XLyreCyiQyqyX8xTKesgGt30
+2tkRAD3VkCtRjMXX5CXEzoPiFElzkJHfHg==
 -----END EC PRIVATE KEY-----

test/client_certs/consul-agent-ca-key.pem

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICDZ+CIUIyHeCulc0Av0afGc6iUrXp6LI+RMCtzXq2f/oAoGCCqGSM49
-AwEHoUQDQgAEdegVURrrCMAdJqm065wYxHwr1HgocnVd+NPABufHiTJPPY4EIucf
-WfpCvVBd3a5quRkZRobnQYK4BHPMFPm2Qg==
+MHcCAQEEIIH0PuHoVgBRUbkAGH/ZJ49GxWrX5fKws3z6LJJp1pw7oAoGCCqGSM49
+AwEHoUQDQgAE79JHKa+fr3Ird9hUoZLBK5GkvlUQ1dj2sXmn21q7PSDsnjy7r44l
+X/rL1uVDpd/YJO6venDB6ApRgMVdZl/msw==
 -----END EC PRIVATE KEY-----

test/client_certs/consul-agent-ca.pem

@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCApSgAwIBAgIRAJtKNACj8KAiBWSSqeYB15EwCgYIKoZIzj0EAwIwgbkx
+MIIC8DCCApagAwIBAgIRANMwU4romcy9OnAAx7c9UFswCgYIKoZIzj0EAwIwgbkx
 CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
 bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
 FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB
-IDIwNjQxNTYyNDA1MDIyOTg4MjQzNTI2NTMwNzkwODU3NzAyMzg4OTAeFw0yMzEx
-MDIxNDA2MDhaFw0yODEwMzExNDA2MDhaMIG5MQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xGjAYBgNVBAkTETEwMSBTZWNv
-bmQgU3RyZWV0MQ4wDAYDVQQREwU5NDEwNTEXMBUGA1UEChMOSGFzaGlDb3JwIElu
-Yy4xQDA+BgNVBAMTN0NvbnN1bCBBZ2VudCBDQSAyMDY0MTU2MjQwNTAyMjk4ODI0
-MzUyNjUzMDc5MDg1NzcwMjM4ODkwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR1
-6BVRGusIwB0mqbTrnBjEfCvUeChydV3408AG58eJMk89jgQi5x9Z+kK9UF3drmq5
-GRlGhudBgrgEc8wU+bZCo3sweTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zApBgNVHQ4EIgQgmoIDM1aUkGTrzK0Am2eou2/DZWWUiZU1lfCFatJsPnAw
-KwYDVR0jBCQwIoAgmoIDM1aUkGTrzK0Am2eou2/DZWWUiZU1lfCFatJsPnAwCgYI
-KoZIzj0EAwIDRwAwRAIgcoZwCzJGdL7LFL7Bbp+26OfNvnyhfchSDdN6YEukIVIC
-IAd+GbxNZbSqTrIackV1/VkM0y1ZJ8si9IiecRNOKOMi
+IDI4MDcxODAzMTgwNTI5NjkwNTc0ODM1NzYyNTEyOTg0OTQwOTYyNzAgFw0yMzEx
+MDIxNTI5NDVaGA8yMTIzMTAwOTE1Mjk0NVowgbkxCzAJBgNVBAYTAlVTMQswCQYD
+VQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEaMBgGA1UECRMRMTAxIFNl
+Y29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcwFQYDVQQKEw5IYXNoaUNvcnAg
+SW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENBIDI4MDcxODAzMTgwNTI5Njkw
+NTc0ODM1NzYyNTEyOTg0OTQwOTYyNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BO/SRymvn69yK3fYVKGSwSuRpL5VENXY9rF5p9tauz0g7J48u6+OJV/6y9blQ6Xf
+2CTur3pwwegKUYDFXWZf5rOjezB5MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8E
+BTADAQH/MCkGA1UdDgQiBCBGa65jF6Wwq9OmdbgJIRCYv++xHG8dRBUpwvSk0Mk1
++jArBgNVHSMEJDAigCBGa65jF6Wwq9OmdbgJIRCYv++xHG8dRBUpwvSk0Mk1+jAK
+BggqhkjOPQQDAgNIADBFAiEA1nklH0P2rsCNv/wMVKK9/07ICFTl18bpwzb7zycf
+5+sCIEIfm6RK9e8WACmFGoaaeQjxwrCSMwGSDCw9FSU6BeZB
 -----END CERTIFICATE-----

test/client_certs/dc1-client-consul-0-key.pem

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILsRH87p2w58u2Re7XGAmPuI1grBy7ZMsxWDP7tJ/pL0oAoGCCqGSM49
-AwEHoUQDQgAEcSaUbB8GT/WlJjIvvbjEdgs7hEJqUrU5POXv8N9tNAe/FRbb1yBF
-U2dBrHgBlJp+sp0gp3cRUCzQMkLO5acwlg==
+MHcCAQEEINE2CQhnu7ipo67FGbEBRXoYRCTM4uJdHgNRTrdkAnHCoAoGCCqGSM49
+AwEHoUQDQgAEq+XXKFuwj2vsjEnEuu1lM1heQJe4XLyreCyiQyqyX8xTKesgGt30
+2tkRAD3VkCtRjMXX5CXEzoPiFElzkJHfHg==
 -----END EC PRIVATE KEY-----

test/client_certs/dc1-client-consul-0.pem

@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICnTCCAkOgAwIBAgIRAO78TJMhBu87zWa1WjcG5rkwCgYIKoZIzj0EAwIwgbkx
-CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
-bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
-FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB
-IDIwNjQxNTYyNDA1MDIyOTg4MjQzNTI2NTMwNzkwODU3NzAyMzg4OTAeFw0yMzEx
-MDIxNDA2MDhaFw0yNDExMDExNDA2MDhaMBwxGjAYBgNVBAMTEWNsaWVudC5kYzEu
-Y29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEcSaUbB8GT/WlJjIvvbjE
-dgs7hEJqUrU5POXv8N9tNAe/FRbb1yBFU2dBrHgBlJp+sp0gp3cRUCzQMkLO5acw
-lqOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEIGV49e7k/a39oKuJCrdyF0Hs
-cgoZx+I2WwMGaT5soLG1MCsGA1UdIwQkMCKAIJqCAzNWlJBk68ytAJtnqLtvw2Vl
-lImVNZXwhWrSbD5wMC0GA1UdEQQmMCSCEWNsaWVudC5kYzEuY29uc3Vsgglsb2Nh
-bGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIhAPnAeouhL4lCbOuYj6REbJ2q
-WZDLv5j7AY5uXoLOtMgLAiALUk1/M2oUO1y61qTMLdCGQh3g6gKpSEB1vo/el1hQ
-VA==
+MIICnjCCAkSgAwIBAgIQAxVHhSG0wSbdZm+3ToYAkDAKBggqhkjOPQQDAjCBuTEL
+MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv
+MRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV
+BgNVBAoTDkhhc2hpQ29ycCBJbmMuMUAwPgYDVQQDEzdDb25zdWwgQWdlbnQgQ0Eg
+MjgwNzE4MDMxODA1Mjk2OTA1NzQ4MzU3NjI1MTI5ODQ5NDA5NjI3MCAXDTIzMTEw
+MjE1Mjk0NVoYDzIxMjMxMDA5MTUyOTQ1WjAcMRowGAYDVQQDExFjbGllbnQuZGMx
+LmNvbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKvl1yhbsI9r7IxJxLrt
+ZTNYXkCXuFy8q3gsokMqsl/MUynrIBrd9NrZEQA91ZArUYzF1+QlxM6D4hRJc5CR
+3x6jgccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCCvXve+zMFSJMXNS3l3YL9k
+2QH8zF74wa+TlwFSaQEjGzArBgNVHSMEJDAigCBGa65jF6Wwq9OmdbgJIRCYv++x
+HG8dRBUpwvSk0Mk1+jAtBgNVHREEJjAkghFjbGllbnQuZGMxLmNvbnN1bIIJbG9j
+YWxob3N0hwR/AAABMAoGCCqGSM49BAMCA0gAMEUCIBLqa1Zh3KUE0RiQzWdoYXkU
+wZo5aBw9ujqzLyAqxToFAiEAihWmc4r6lDYRR35X4QB1nTT92POJRClsfLPOTRG5
+rsU=
 -----END CERTIFICATE-----

test/client_certs/dc1-server-consul-0-key.pem

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDBtgIlMLp68GuAx3GzgvqA6L4pzF7ra4U8KBAeAjYwroAoGCCqGSM49
-AwEHoUQDQgAE//3g7OUk49Wucef353sgAK2QAZJY5iiwYRHrKy8eGaEkBxJBFv0Z
-QfXdtsFtJ3XuMk7OfDPEZ1g1VUYIRVPCbw==
+MHcCAQEEIDFaDmSkx6Pnn7mQJAsAjl1XIg4YhHgUW2yclB9QoWI5oAoGCCqGSM49
+AwEHoUQDQgAEiFhfuej4FXqKjtxlto9o5dTnz8rMGRbzam7YULKN531XZnNbPsOw
+PWFyWDVlNbOzkzY32CLVl7ObfDlCtL36gw==
 -----END EC PRIVATE KEY-----

test/client_certs/dc1-server-consul-0.pem

@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICwzCCAmqgAwIBAgIQJeudmzJEAViQ9sIJfwC8RjAKBggqhkjOPQQDAjCBuTEL
-MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv
-MRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV
-BgNVBAoTDkhhc2hpQ29ycCBJbmMuMUAwPgYDVQQDEzdDb25zdWwgQWdlbnQgQ0Eg
-MjA2NDE1NjI0MDUwMjI5ODgyNDM1MjY1MzA3OTA4NTc3MDIzODg5MB4XDTIzMTEw
-MjE0MDYwOFoXDTI0MTEwMTE0MDYwOFowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j
-b25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT//eDs5STj1a5x5/fneyAA
-rZABkljmKLBhEesrLx4ZoSQHEkEW/RlB9d22wW0nde4yTs58M8RnWDVVRghFU8Jv
-o4HvMIHsMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgakV8pQCroFdBBW0TyFgVDbHB
-ZFlLvu9sXfk6+xBtqY8wKwYDVR0jBCQwIoAgmoIDM1aUkGTrzK0Am2eou2/DZWWU
-iZU1lfCFatJsPnAwVQYDVR0RBE4wTIILY29uc3VsLnRlc3SCGXNlcnZlcjAuc2Vy
-dmVyLmRjMS5jb25zdWyCEXNlcnZlci5kYzEuY29uc3Vsgglsb2NhbGhvc3SHBH8A
-AAEwCgYIKoZIzj0EAwIDRwAwRAIgB5HA/sAnp5EWLpo+PjM1SAoU6uiE5trKTBPE
-UB5+NOoCICuz1zsVEuCTRo7dbFK5d5+G2gM7dwOU0E5nGFqCW46I
+MIICxjCCAm2gAwIBAgIRAP6e14CosD1ulIkguwrpihowCgYIKoZIzj0EAwIwgbkx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
+bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
+FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB
+IDI4MDcxODAzMTgwNTI5NjkwNTc0ODM1NzYyNTEyOTg0OTQwOTYyNzAgFw0yMzEx
+MDIxNTI5NDVaGA8yMTIzMTAwOTE1Mjk0NVowHDEaMBgGA1UEAxMRc2VydmVyLmRj
+MS5jb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASIWF+56PgVeoqO3GW2
+j2jl1OfPyswZFvNqbthQso3nfVdmc1s+w7A9YXJYNWU1s7OTNjfYItWXs5t8OUK0
+vfqDo4HvMIHsMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgMO523nDhmf6DDJFSO9ly
++Y5UcgW1TKqCTt+yJkPWG2EwKwYDVR0jBCQwIoAgRmuuYxelsKvTpnW4CSEQmL/v
+sRxvHUQVKcL0pNDJNfowVQYDVR0RBE4wTIILY29uc3VsLnRlc3SCGXNlcnZlcjAu
+c2VydmVyLmRjMS5jb25zdWyCEXNlcnZlci5kYzEuY29uc3Vsgglsb2NhbGhvc3SH
+BH8AAAEwCgYIKoZIzj0EAwIDRwAwRAIgRxmCHvcCJ0FoA/uelR2dNAasXkZa0pZr
+bfCWeAUVf5QCIA587F7IqokthpSlbI3W9R3NyES2fffpjUtmxdrQ7cJS
 -----END CERTIFICATE-----

test/client_certs/generate.sh

@@ -10,7 +10,7 @@ cd "$(dirname "$0")"
 if [[ ! -f consul-agent-ca-key.pem ]] || [[ ! -f consul-agent-ca.pem ]]; then
     echo "Regenerating CA..."
     rm -f consul-agent-ca-key.pem consul-agent-ca.pem
-    consul tls ca create
+    consul tls ca create -days 36500
 fi
 rm -f rootca.crt rootca.key path/rootca.crt
 cp consul-agent-ca.pem rootca.crt
@@ -20,7 +20,7 @@ cp rootca.crt path
 if [[ ! -f dc1-server-consul-0.pem ]] || [[ ! -f dc1-server-consul-0-key.pem ]]; then
     echo "Regenerating server..."
     rm -f dc1-server-consul-0.pem dc1-server-consul-0-key.pem
-    consul tls cert create -server -node=server0 -additional-dnsname=consul.test
+    consul tls cert create -days=36500 -server -node=server0 -additional-dnsname=consul.test
 fi
 rm -f server.crt server.key
 cp dc1-server-consul-0.pem server.crt
@@ -29,7 +29,7 @@ cp dc1-server-consul-0-key.pem server.key
 if [[ ! -f dc1-client-consul-0.pem ]] || [[ ! -f dc1-client-consul-0-key.pem ]]; then
     echo "Regenerating client..."
     rm -f dc1-client-consul-0.pem dc1-client-consul-0-key.pem
-    consul tls cert create -client
+    consul tls cert create -days 36500 -client
 fi
 rm -f client.crt client.key
 cp dc1-client-consul-0.pem client.crt

test/client_certs/path/rootca.crt

@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCApSgAwIBAgIRAJtKNACj8KAiBWSSqeYB15EwCgYIKoZIzj0EAwIwgbkx
+MIIC8DCCApagAwIBAgIRANMwU4romcy9OnAAx7c9UFswCgYIKoZIzj0EAwIwgbkx
 CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
 bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
 FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB
-IDIwNjQxNTYyNDA1MDIyOTg4MjQzNTI2NTMwNzkwODU3NzAyMzg4OTAeFw0yMzEx
-MDIxNDA2MDhaFw0yODEwMzExNDA2MDhaMIG5MQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xGjAYBgNVBAkTETEwMSBTZWNv
-bmQgU3RyZWV0MQ4wDAYDVQQREwU5NDEwNTEXMBUGA1UEChMOSGFzaGlDb3JwIElu
-Yy4xQDA+BgNVBAMTN0NvbnN1bCBBZ2VudCBDQSAyMDY0MTU2MjQwNTAyMjk4ODI0
-MzUyNjUzMDc5MDg1NzcwMjM4ODkwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR1
-6BVRGusIwB0mqbTrnBjEfCvUeChydV3408AG58eJMk89jgQi5x9Z+kK9UF3drmq5
-GRlGhudBgrgEc8wU+bZCo3sweTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zApBgNVHQ4EIgQgmoIDM1aUkGTrzK0Am2eou2/DZWWUiZU1lfCFatJsPnAw
-KwYDVR0jBCQwIoAgmoIDM1aUkGTrzK0Am2eou2/DZWWUiZU1lfCFatJsPnAwCgYI
-KoZIzj0EAwIDRwAwRAIgcoZwCzJGdL7LFL7Bbp+26OfNvnyhfchSDdN6YEukIVIC
-IAd+GbxNZbSqTrIackV1/VkM0y1ZJ8si9IiecRNOKOMi
+IDI4MDcxODAzMTgwNTI5NjkwNTc0ODM1NzYyNTEyOTg0OTQwOTYyNzAgFw0yMzEx
+MDIxNTI5NDVaGA8yMTIzMTAwOTE1Mjk0NVowgbkxCzAJBgNVBAYTAlVTMQswCQYD
+VQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEaMBgGA1UECRMRMTAxIFNl
+Y29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcwFQYDVQQKEw5IYXNoaUNvcnAg
+SW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENBIDI4MDcxODAzMTgwNTI5Njkw
+NTc0ODM1NzYyNTEyOTg0OTQwOTYyNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BO/SRymvn69yK3fYVKGSwSuRpL5VENXY9rF5p9tauz0g7J48u6+OJV/6y9blQ6Xf
+2CTur3pwwegKUYDFXWZf5rOjezB5MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8E
+BTADAQH/MCkGA1UdDgQiBCBGa65jF6Wwq9OmdbgJIRCYv++xHG8dRBUpwvSk0Mk1
++jArBgNVHSMEJDAigCBGa65jF6Wwq9OmdbgJIRCYv++xHG8dRBUpwvSk0Mk1+jAK
+BggqhkjOPQQDAgNIADBFAiEA1nklH0P2rsCNv/wMVKK9/07ICFTl18bpwzb7zycf
+5+sCIEIfm6RK9e8WACmFGoaaeQjxwrCSMwGSDCw9FSU6BeZB
 -----END CERTIFICATE-----

test/client_certs/rootca.crt

@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCApSgAwIBAgIRAJtKNACj8KAiBWSSqeYB15EwCgYIKoZIzj0EAwIwgbkx
+MIIC8DCCApagAwIBAgIRANMwU4romcy9OnAAx7c9UFswCgYIKoZIzj0EAwIwgbkx
 CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
 bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
 FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB
-IDIwNjQxNTYyNDA1MDIyOTg4MjQzNTI2NTMwNzkwODU3NzAyMzg4OTAeFw0yMzEx
-MDIxNDA2MDhaFw0yODEwMzExNDA2MDhaMIG5MQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xGjAYBgNVBAkTETEwMSBTZWNv
-bmQgU3RyZWV0MQ4wDAYDVQQREwU5NDEwNTEXMBUGA1UEChMOSGFzaGlDb3JwIElu
-Yy4xQDA+BgNVBAMTN0NvbnN1bCBBZ2VudCBDQSAyMDY0MTU2MjQwNTAyMjk4ODI0
-MzUyNjUzMDc5MDg1NzcwMjM4ODkwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR1
-6BVRGusIwB0mqbTrnBjEfCvUeChydV3408AG58eJMk89jgQi5x9Z+kK9UF3drmq5
-GRlGhudBgrgEc8wU+bZCo3sweTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zApBgNVHQ4EIgQgmoIDM1aUkGTrzK0Am2eou2/DZWWUiZU1lfCFatJsPnAw
-KwYDVR0jBCQwIoAgmoIDM1aUkGTrzK0Am2eou2/DZWWUiZU1lfCFatJsPnAwCgYI
-KoZIzj0EAwIDRwAwRAIgcoZwCzJGdL7LFL7Bbp+26OfNvnyhfchSDdN6YEukIVIC
-IAd+GbxNZbSqTrIackV1/VkM0y1ZJ8si9IiecRNOKOMi
+IDI4MDcxODAzMTgwNTI5NjkwNTc0ODM1NzYyNTEyOTg0OTQwOTYyNzAgFw0yMzEx
+MDIxNTI5NDVaGA8yMTIzMTAwOTE1Mjk0NVowgbkxCzAJBgNVBAYTAlVTMQswCQYD
+VQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEaMBgGA1UECRMRMTAxIFNl
+Y29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcwFQYDVQQKEw5IYXNoaUNvcnAg
+SW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENBIDI4MDcxODAzMTgwNTI5Njkw
+NTc0ODM1NzYyNTEyOTg0OTQwOTYyNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BO/SRymvn69yK3fYVKGSwSuRpL5VENXY9rF5p9tauz0g7J48u6+OJV/6y9blQ6Xf
+2CTur3pwwegKUYDFXWZf5rOjezB5MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8E
+BTADAQH/MCkGA1UdDgQiBCBGa65jF6Wwq9OmdbgJIRCYv++xHG8dRBUpwvSk0Mk1
++jArBgNVHSMEJDAigCBGa65jF6Wwq9OmdbgJIRCYv++xHG8dRBUpwvSk0Mk1+jAK
+BggqhkjOPQQDAgNIADBFAiEA1nklH0P2rsCNv/wMVKK9/07ICFTl18bpwzb7zycf
+5+sCIEIfm6RK9e8WACmFGoaaeQjxwrCSMwGSDCw9FSU6BeZB
 -----END CERTIFICATE-----

test/client_certs/rootca.key

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICDZ+CIUIyHeCulc0Av0afGc6iUrXp6LI+RMCtzXq2f/oAoGCCqGSM49
-AwEHoUQDQgAEdegVURrrCMAdJqm065wYxHwr1HgocnVd+NPABufHiTJPPY4EIucf
-WfpCvVBd3a5quRkZRobnQYK4BHPMFPm2Qg==
+MHcCAQEEIIH0PuHoVgBRUbkAGH/ZJ49GxWrX5fKws3z6LJJp1pw7oAoGCCqGSM49
+AwEHoUQDQgAE79JHKa+fr3Ird9hUoZLBK5GkvlUQ1dj2sXmn21q7PSDsnjy7r44l
+X/rL1uVDpd/YJO6venDB6ApRgMVdZl/msw==
 -----END EC PRIVATE KEY-----

test/client_certs/server.crt

@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICwzCCAmqgAwIBAgIQJeudmzJEAViQ9sIJfwC8RjAKBggqhkjOPQQDAjCBuTEL
-MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv
-MRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV
-BgNVBAoTDkhhc2hpQ29ycCBJbmMuMUAwPgYDVQQDEzdDb25zdWwgQWdlbnQgQ0Eg
-MjA2NDE1NjI0MDUwMjI5ODgyNDM1MjY1MzA3OTA4NTc3MDIzODg5MB4XDTIzMTEw
-MjE0MDYwOFoXDTI0MTEwMTE0MDYwOFowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j
-b25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT//eDs5STj1a5x5/fneyAA
-rZABkljmKLBhEesrLx4ZoSQHEkEW/RlB9d22wW0nde4yTs58M8RnWDVVRghFU8Jv
-o4HvMIHsMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgakV8pQCroFdBBW0TyFgVDbHB
-ZFlLvu9sXfk6+xBtqY8wKwYDVR0jBCQwIoAgmoIDM1aUkGTrzK0Am2eou2/DZWWU
-iZU1lfCFatJsPnAwVQYDVR0RBE4wTIILY29uc3VsLnRlc3SCGXNlcnZlcjAuc2Vy
-dmVyLmRjMS5jb25zdWyCEXNlcnZlci5kYzEuY29uc3Vsgglsb2NhbGhvc3SHBH8A
-AAEwCgYIKoZIzj0EAwIDRwAwRAIgB5HA/sAnp5EWLpo+PjM1SAoU6uiE5trKTBPE
-UB5+NOoCICuz1zsVEuCTRo7dbFK5d5+G2gM7dwOU0E5nGFqCW46I
+MIICxjCCAm2gAwIBAgIRAP6e14CosD1ulIkguwrpihowCgYIKoZIzj0EAwIwgbkx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
+bzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw
+FQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB
+IDI4MDcxODAzMTgwNTI5NjkwNTc0ODM1NzYyNTEyOTg0OTQwOTYyNzAgFw0yMzEx
+MDIxNTI5NDVaGA8yMTIzMTAwOTE1Mjk0NVowHDEaMBgGA1UEAxMRc2VydmVyLmRj
+MS5jb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASIWF+56PgVeoqO3GW2
+j2jl1OfPyswZFvNqbthQso3nfVdmc1s+w7A9YXJYNWU1s7OTNjfYItWXs5t8OUK0
+vfqDo4HvMIHsMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgMO523nDhmf6DDJFSO9ly
++Y5UcgW1TKqCTt+yJkPWG2EwKwYDVR0jBCQwIoAgRmuuYxelsKvTpnW4CSEQmL/v
+sRxvHUQVKcL0pNDJNfowVQYDVR0RBE4wTIILY29uc3VsLnRlc3SCGXNlcnZlcjAu
+c2VydmVyLmRjMS5jb25zdWyCEXNlcnZlci5kYzEuY29uc3Vsgglsb2NhbGhvc3SH
+BH8AAAEwCgYIKoZIzj0EAwIDRwAwRAIgRxmCHvcCJ0FoA/uelR2dNAasXkZa0pZr
+bfCWeAUVf5QCIA587F7IqokthpSlbI3W9R3NyES2fffpjUtmxdrQ7cJS
 -----END CERTIFICATE-----

test/client_certs/server.key

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDBtgIlMLp68GuAx3GzgvqA6L4pzF7ra4U8KBAeAjYwroAoGCCqGSM49
-AwEHoUQDQgAE//3g7OUk49Wucef353sgAK2QAZJY5iiwYRHrKy8eGaEkBxJBFv0Z
-QfXdtsFtJ3XuMk7OfDPEZ1g1VUYIRVPCbw==
+MHcCAQEEIDFaDmSkx6Pnn7mQJAsAjl1XIg4YhHgUW2yclB9QoWI5oAoGCCqGSM49
+AwEHoUQDQgAEiFhfuej4FXqKjtxlto9o5dTnz8rMGRbzam7YULKN531XZnNbPsOw
+PWFyWDVlNbOzkzY32CLVl7ObfDlCtL36gw==
 -----END EC PRIVATE KEY-----

test/hostname/Alice.crt

@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEEzCCAvugAwIBAgIBNjANBgkqhkiG9w0BAQ0FADCBmTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRkwFwYD
-VQQKExBIYWhpQ29ycCBUZXN0IENBMQ0wCwYDVQQLEwRUZXN0MREwDwYDVQQDEwhD
-ZXJ0QXV0aDEiMCAGCSqGSIb3DQEJARYTamFtZXNAaGFzaGljb3JwLmNvbTAgFw0y
-MzExMDIxNDE3MTZaGA8yMTIzMTAwOTE0MTcxNlowgYMxDjAMBgNVBAMMBUFsaWNl
-MRMwEQYDVQQIDApDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzEpMCcGCSqGSIb3DQEJ
-ARYaZG8tbm90LXJlcGx5QGhhc2hpY29ycC5jb20xEjAQBgNVBAoMCUVuZCBQb2lu
-dDEQMA4GA1UECwwHVGVzdGluZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMJ12Q87/iDyvoGQ15aGtr9D9QlDi0+a+22k68e+uFNJExkdgz08i6diJZLj
-OOlHX5w+nQjDtWE4km9hNp20MG1OUCTTGeuoe7e8CtwNrSj4p0eMKvM54pPNB2rB
-166vL93dElHSLvjALjGN32lHb1v04xJY4QxBfRK+sihf/X0CdmMlf8ic9GkK6KE3
-neu9uBBMH7tcOSEKOetIwmSIA2vIdRK/dvAC2Y4sfIXgExaqk6aDCLr907ctsoBc
-+I7t63PkeXwDsHSJRbJ8vhw568QWCpd5YenVH+RlakJ06QPDSIx4WhHQ1t8KctZQ
-OfcBlXkABM8483NG9Pk4+kul5I8CAwEAAaN4MHYwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHAYDVR0RBBUwE4IRc2VydmVyLmRjMS5jb25zdWwwHQYDVR0OBBYEFAPO
-IGFQ8uNu3oQW/CUV5ROCyCE3MB8GA1UdIwQYMBaAFFV/pGmUd2WIZQKufC+r9DEX
-i2MBMA0GCSqGSIb3DQEBDQUAA4IBAQCcUbkMg2l3mIbLZNalu4GHOaumCRHbUVtQ
-OtienyzhLJ4MyCloRPzFQVk2woTHZl3BbAUO34acU574xebQKStTuY+RZQya0Rb0
-Bua346H4UYq+06TtTNxEzmqauXWZ74QYmkT3qJspzeyGZbYmstzDp7Q8fJbiV1WR
-3d9maKP46RmF3vgFHuhYgXs3EwQegyeDzETZhyh1ul2pPz0F9E/zPMQthxvOfu7M
-sLzbZ6O2kIGIlRMgsZ6d4Z7jMDqh7w6N08xfO4AtX1Xof17r/xlrQNYocvcpO4T5
-QXrfkKZrAKIlHaTm9WsYlx4Yk0gdRxE9vYa1tE6SomSSUEuuj3tm
+MIIECTCCAvGgAwIBAgIBOjANBgkqhkiG9w0BAQ0FADCBjzELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbnNpc2NvMRcwFQYDVQQKDA5I
+YXNoaUNvcnAgVGVzdDENMAsGA1UECwwEVGVzdDERMA8GA1UEAwwIQ2VydEF1dGgx
+IDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMCAXDTIzMTEwMjE2MDcx
+N1oYDzIxMjMxMDA5MTYwNzE3WjCBgzEOMAwGA1UEAwwFQWxpY2UxEzARBgNVBAgM
+CkNhbGlmb3JuaWExCzAJBgNVBAYTAlVTMSkwJwYJKoZIhvcNAQkBFhpkby1ub3Qt
+cmVwbHlAaGFzaGljb3JwLmNvbTESMBAGA1UECgwJRW5kIFBvaW50MRAwDgYDVQQL
+DAdUZXN0aW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzjZrePTR
+TuVQ7N7SbeHc0OUEDKezY/PZHTlDw7MK5p/1EICbWCL0IWq51t1N+F2NKN/Wi3Xv
+PgTbdsJ5LIaTCZpKqgPzFrq5edYnbAVneaobPR5V8Fwxv+qn2QuNFULUq5SRliWy
+sDqm3o5CMH+5K9ejOcFnQ/6+BVFGU0SiLISBHRm7aKjFPDQ6jkv9fTopvwmRNwrf
+hjueMg5QD/JtlPRArBulwFaBCmB6/sIdO2Dw+5BzAuOKcGe+McMu0tX+whlx2Rgm
+3cuNlTDGRsFdWQ3GNCYbk8xgw76l9bKOF9nE/vCesjzY4uMzfTmBwHsuVgCWzQnk
+3L7h/dSkUwsZPwIDAQABo3gwdjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAcBgNV
+HREEFTATghFzZXJ2ZXIuZGMxLmNvbnN1bDAdBgNVHQ4EFgQUaFqSFmBGU9+H8pdc
+BkGCU2swEhIwHwYDVR0jBBgwFoAUITcAt4ctta2/yGsSFfNF/QmXkkYwDQYJKoZI
+hvcNAQENBQADggEBANHHnsC/Gi9yAKp1AyWPLmqztdkn0ES9n1cDL0m3khpbxyW4
+/KnnjhncUNHu5Ozo1F8nV4sRnNZ+v3tbA4uWp/8ZUHz3F7epBfINBIvUGM4pQmAJ
+nmTIs8nvLzqNt8hUy6hoOIQIzqljf/dscfZ9lT7mdxVWenLfsTJL0rOCJV+w8WAQ
+LtIs86sxZca3tr7JnzX9D2KTVGJVPLTungYy3pdZfVhPdQfqCVnf0lG3KSiMBk62
+8tZC61KThJLyj7HTtT9QkTJGcZcfFJuLh+72aPoWVazWnSlid971zgTzj5NfNMPX
+HdUvj9jEd4JhgcLvIeZEKFmu3wA5uxT8vTC5YwY=
 -----END CERTIFICATE-----

test/hostname/Alice.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDCddkPO/4g8r6B
-kNeWhra/Q/UJQ4tPmvttpOvHvrhTSRMZHYM9PIunYiWS4zjpR1+cPp0Iw7VhOJJv
-YTadtDBtTlAk0xnrqHu3vArcDa0o+KdHjCrzOeKTzQdqwdeury/d3RJR0i74wC4x
-jd9pR29b9OMSWOEMQX0SvrIoX/19AnZjJX/InPRpCuihN53rvbgQTB+7XDkhCjnr
-SMJkiANryHUSv3bwAtmOLHyF4BMWqpOmgwi6/dO3LbKAXPiO7etz5Hl8A7B0iUWy
-fL4cOevEFgqXeWHp1R/kZWpCdOkDw0iMeFoR0NbfCnLWUDn3AZV5AATPOPNzRvT5
-OPpLpeSPAgMBAAECggEANe/+Lu2TBYyPLt0AD256Tf8JfnJPt9rjFnyCMbtC4UcJ
-lxPKjTe3/MuKZH3GEV6MtIfhgsbWDotkgqRSQ9fw/sCUFkK/k8/90O7FjFf2ycB+
-lafZWfGaWSirf/8YVgmdm0pwhGVqRfD4XyJc75Sy3KzGNxaUBZQ8nvBp9iz54KxL
-WKPgSQB1uLivRYzvDS+naonBvco4GpOLDbTKin2dYWY7fRWE8UIdaUCzhIioiFLu
-AQbf/b6FpDTUG24sWmoGanpseiDtmW+sExA8mX9rorRpa7e5vqj20bchyD5i033D
-7aKGoZzdHLnVlJmSxNdKZaDBYDOajaYiMXTE8NXqEQKBgQD+R/BgfukZgpetBqu9
-Mj2BwjAmALX88WH16lAv00SOXPj1VK91K4Y9isbhheW0vFRbcbw7pu6tMrev1sbX
-d06/dTQufgiZKoY3agth6tgMNZ/TvDUu/KZU6YoR1W2dkRa9BYhGrVql2WRLt+AV
-mDX2c6+AwJFw2/Pg6yqF5wUhAwKBgQDDxmH6PMOPvKVssY4YLn36gZR+VzIxamNg
-hK1PSgebQ8SWFm7XVrWUY6NkAK3+6bV42PiyXkwcMs0mvUU9ZAfTH9P+beuo7g97
-3b72Q6IwMZkcLnsEcoKfOopnVZ7Iu045veIS08CYezNCfXQfUqB7UlUCHUls4r5A
-enQZkEXqhQKBgFPVlfvKe8GsW6NxKpgDA2JPip5M57NQRfLU4METz2t8XZxM4lgo
-FGcf5PgftB8FZG6NrfigzdoOeZ8gmYgaTr0ywBR/+we8jGmircQHsFk+KMafK42l
-QJWINbwxeKVVW4DQXSCoMNWzOaz5H4kfGNN7SqaRVqI18k76WZeyFe/PAoGAB1Yv
-5cjRK1nOeTxOLunPHswsXG+4GdH612shc486qb7oZxeAH+HH/D+fp+e+nYb0ngrD
-hyuxfn0I4yLErYBKKsdOkoJcCoChY+rzdRcjxNqW+k9jnM8NxhnThfvXb35VeCR9
-jGcTGKPFUACTkXjvOq/jL6kZT1NP/eqY3zxg4mECgYBWBojTb8n2hff3iRfWRyp8
-zoyteZrUz6apXM1dWQpmU9Qyu325CXFdMQuGCUBIAWNf8no38ZJvDZUAoLOky1Ni
-fMnsVXEi69jRYQRVo2AjV+caBhW6k0KWlFn7mCdyh7bh2WXcvLtUnylc/7bPONyX
-gxVKzytFZRegtcqJut742A==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDONmt49NFO5VDs
+3tJt4dzQ5QQMp7Nj89kdOUPDswrmn/UQgJtYIvQharnW3U34XY0o39aLde8+BNt2
+wnkshpMJmkqqA/MWurl51idsBWd5qhs9HlXwXDG/6qfZC40VQtSrlJGWJbKwOqbe
+jkIwf7kr16M5wWdD/r4FUUZTRKIshIEdGbtoqMU8NDqOS/19Oim/CZE3Ct+GO54y
+DlAP8m2U9ECsG6XAVoEKYHr+wh07YPD7kHMC44pwZ74xwy7S1f7CGXHZGCbdy42V
+MMZGwV1ZDcY0JhuTzGDDvqX1so4X2cT+8J6yPNji4zN9OYHAey5WAJbNCeTcvuH9
+1KRTCxk/AgMBAAECggEAKyRJgcm+TII/Vv8bCTAasX1oRnmDV2L5xlpnqfa4Th2i
++KvfVCYj6yXX8XLlUBPKZ4XE7fJjdhcwDv2Kul0BQB4OhtlCrzureCjsoHXU+ygy
+gKvrENlI8zzVltwKzSrpMWhouP/0DViH9sHOaTUfeWOo23lx8FDIUnZ5fww53ZQO
+8QASgcyMeb2mBZZiwG4m8U4iPW1B1sAMOJKeq8pLWX+bLL7JGt6FH2/fUg54Rctt
+0S/KYBl6coFMNO9hxateTkUhz8DSPH2mhx5TiNbwnsI2nE7r8IUv8kh7qPxKREbA
+WW0Qoie/3vVjn8qYffrFj2kUDhVrQp1yPnQO+CigoQKBgQDv1hEzLeacrHzxDJwZ
+5yj5qT2wUIqCuggpBK514cGrTu99t90s8pR2M5fjhqFfIul0fWKkpBjrdT4bsZdk
+JQfncEr2Y7JC8Nl835Y//vOLisISZwOzJlRRP+rpgUVBZ1bSziZF3tT1iGlzJDUg
+zuvtLfvvXzWIHWfBWf5xv1570QKBgQDcHD0jUH2Xx6vKRuvfgCrtqdHcnT7I1Cgz
+FqeVDV4D3nzqmuJ7YwWmk2ZGI5uJWDv4TvLB6y65t+7AWfpDPM3/ig32bcl7ffdn
+pYMGJ/ExWgicLC3i082aYdGlYx6m6qJp9m90auo7GDT0vE5d+5mIQKu7vX2Nwi8P
+1nxhqVJYDwKBgFDGD9TkyJ5LmWi1jn1K1QoAbb5L4dpVPRpTcU5SUh+X3iDBI8RX
+jpigl68RUJfx8h5BfE9m1N24Bsrc7NfVgOv5bcW9nfPdmeHsi3XSL8P3X5VDDIPx
+jMQwerVZzDFS1HL66vjtK1vmLV2R/DKofdzLd+YOcsD85kzAOmmkwfWBAoGAOiWX
+nRmpZAxSfKhJrYxtSsWe9BnyORma2Qw2DzEt0fXXqB5skE3zczLjRMopT5oolYs9
+pC7d9B/8CYJ7k4Gfpc8xqxULsfzv+8iEmX65v+DZ/2/IW3C6kvseaAOMWGoJp9Z7
+URThdeUKMFECnt9ViuISvBDt9yICTrvJtf8GCs8CgYEAije1UlRA498ZpzuGrlYs
+xiPwasPxm82Dje5FzaNBmRUBD7/fkONsNIga9UdayKv+Mw/1L/f9oPOvaMkoiatQ
+pD9XZt3vEjuEV6hoFMcb+aY+X0OOlUyTFg3MwtjpD8xYBCL9YWWsRp02OFeveUUl
+N/P3yG9zG16Xk994XoAxOXQ=
 -----END PRIVATE KEY-----

test/hostname/Betty.crt

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIELjCCAxagAwIBAgIBODANBgkqhkiG9w0BAQ0FADCBmTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRkwFwYD
-VQQKExBIYWhpQ29ycCBUZXN0IENBMQ0wCwYDVQQLEwRUZXN0MREwDwYDVQQDEwhD
-ZXJ0QXV0aDEiMCAGCSqGSIb3DQEJARYTamFtZXNAaGFzaGljb3JwLmNvbTAgFw0y
-MzExMDIxNDE3MTdaGA8yMTIzMTAwOTE0MTcxN1owgYMxDjAMBgNVBAMMBUJldHR5
-MRMwEQYDVQQIDApDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzEpMCcGCSqGSIb3DQEJ
-ARYaZG8tbm90LXJlcGx5QGhhc2hpY29ycC5jb20xEjAQBgNVBAoMCUVuZCBQb2lu
-dDEQMA4GA1UECwwHVGVzdGluZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKqNlGi1SLBzZFZQ4hK8ZlbPdHtg9iONOp1aMxL+eUs/uzpYJNzn4qo71r8o
-EgUbaAP60PVDcdxz1VNxbSL9NPU80/fMevu5lpvRTtf1EQNJqh/FQGDFR52/1j0p
-68m3MwpJ0EUlODI98c3E66Un5gGTGcnqNsTXotGWl4zzeY8CLy4ZWo5/ToGafMHT
-Bk1s0VDx+g9ROnhMjscV6eLAwkPa0vNQtW1REY6kQ+feEUZPHEEYOEdM89RlPHm9
-U4pkGdXjP9j+lD6DRYyJ8GkSx4cGEsge4Gbn6Ynysd4j8umLZ3u0S7w7S9svEr5l
-ZoOMiKI1lXP+0pwDOIEgdVYohncCAwEAAaOBkjCBjzAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIF4DA1BgNVHREELjAsghFzZXJ2ZXIuZGMyLmNvbnN1bIIXYmV0dHkuc2Vy
-dmVyLmRjMi5jb25zdWwwHQYDVR0OBBYEFG/QJlW3De2DxyykpbmmQ+lCcMDqMB8G
-A1UdIwQYMBaAFFV/pGmUd2WIZQKufC+r9DEXi2MBMA0GCSqGSIb3DQEBDQUAA4IB
-AQA6/VQuwESOX0+v6ejLkHbw/1sER942WhmqIn0zMRIGkvpqJkYfo7uWQUIecpKN
-gxrWrxEySpBbo1R/yCTVejWrDBhk29nNY4R6VSU3BrTJaqRbx2d7WoYK5IJm+JCP
-G0Al7FjaR08rEiQxnan7pkFMKp6zF9m4DQYPsh+ZjfsV5ObV/y4f8o7Sq5l96yII
-OwWErws9mTcjN20OM28zcy5H2VyJXegEMhkxz+4n5S7UowDpTUua0ytATtIZ/KXW
-GDBEaA+p9Uz6nK01poEuKl4cWwADEjUJK2Kjvm7jVJP1ifrR7McBWcGksyto94Zh
-lv3F4jH5AaQ25kE2WDnwxRjE
+MIIEJDCCAwygAwIBAgIBPDANBgkqhkiG9w0BAQ0FADCBjzELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbnNpc2NvMRcwFQYDVQQKDA5I
+YXNoaUNvcnAgVGVzdDENMAsGA1UECwwEVGVzdDERMA8GA1UEAwwIQ2VydEF1dGgx
+IDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMCAXDTIzMTEwMjE2MDcx
+N1oYDzIxMjMxMDA5MTYwNzE3WjCBgzEOMAwGA1UEAwwFQmV0dHkxEzARBgNVBAgM
+CkNhbGlmb3JuaWExCzAJBgNVBAYTAlVTMSkwJwYJKoZIhvcNAQkBFhpkby1ub3Qt
+cmVwbHlAaGFzaGljb3JwLmNvbTESMBAGA1UECgwJRW5kIFBvaW50MRAwDgYDVQQL
+DAdUZXN0aW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Qrs3sGo
+Xz5wsPXk+lkBzibzOiFr5i40wyzlh1C/sdRhoUTUrji2zbcBAmSuHFL5BkSxF1cl
+8RmCE6kM+aEl5WET9nthVUuSxqz7q/Mi04ssFROMnGn6WL67YIwiIxkOWe3DOfaj
+9gw+f4Sx3AhpTHBd3qxkY/P/8umjzIyWbK4dBSYIR4X7TGHEZ7m98pPUAPLeygvy
+32ybh9nkU8Cdj2kHmW5CzHEhAJ2wdcclbhbXGBbyMxpRACKqtJS5WWYlFR+C0tMg
+mFHRtK311NQ7L6QR9R7NNcX73LrP1fCzPMoI0Sb88WdlI0ZrmaA+ElLFIvw/7HQp
+UwfvmANmNLR1eQIDAQABo4GSMIGPMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDUG
+A1UdEQQuMCyCEXNlcnZlci5kYzIuY29uc3VsghdiZXR0eS5zZXJ2ZXIuZGMyLmNv
+bnN1bDAdBgNVHQ4EFgQUfNlec2HQa3T4QQiqvRjfMumuLpkwHwYDVR0jBBgwFoAU
+ITcAt4ctta2/yGsSFfNF/QmXkkYwDQYJKoZIhvcNAQENBQADggEBAFcLpLMqVMcg
+QY23LX3lYRKRZs3tT4aqjyZwQ3uP+k2BY8FlzXNapEGGBLJyy51W748AxT2JzkGU
+DFp3DDawyN58z1RDWnRC7cfnNFsJAFC1HKvsuljjv9YR5Fbl+vyEKb4NOd4LoGYl
+DSdpfihX63g7zkDAwCquYZ2IIWwQEXg+AlJ1hLj5YI4J9+OEJG5zun4F+LD921iI
+cNO9RA9wKb7939eDsjKvU5rcdYb1edq5p/q5l+qw5DhyuN+kLFWhZjEmoTSRjy/4
+PwLOqNDOtLI4gpHdTzhjrnzq4lstRxv3pc4G1f0bFPcXzzD2snlg23tR9KP1NTmt
+nlFALloJ0iE=
 -----END CERTIFICATE-----

test/hostname/Betty.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCqjZRotUiwc2RW
-UOISvGZWz3R7YPYjjTqdWjMS/nlLP7s6WCTc5+KqO9a/KBIFG2gD+tD1Q3Hcc9VT
-cW0i/TT1PNP3zHr7uZab0U7X9REDSaofxUBgxUedv9Y9KevJtzMKSdBFJTgyPfHN
-xOulJ+YBkxnJ6jbE16LRlpeM83mPAi8uGVqOf06BmnzB0wZNbNFQ8foPUTp4TI7H
-FeniwMJD2tLzULVtURGOpEPn3hFGTxxBGDhHTPPUZTx5vVOKZBnV4z/Y/pQ+g0WM
-ifBpEseHBhLIHuBm5+mJ8rHeI/Lpi2d7tEu8O0vbLxK+ZWaDjIiiNZVz/tKcAziB
-IHVWKIZ3AgMBAAECggEAFUWfUwf5Tvi1dQaVi9yvrvglARZw3LJKs0GCyUWv/zCt
-u3Mu9dZ+MNlRyXnH9ZcbfBOWaGDHHMXdv5CQGiMWrdeuYGPCmw7kt/59JPZN7ukL
-LPc/NlKkwgohQHOwEvKkjQ3zygwAXFPZit6avXiieWPNfZ+WwSpcBmQP9uaPLMTW
-XfDrU+5V9W+N3Ps5NffkDoq+dU43g3OQXFuxIVYJT+v8aqol4DaF2gZ+0nne2jiC
-QOYqa+/XGf3ssLMXoYUwk4QPaVRQ4qK5EUtjx/FW3+kF+fPe9hGlBRG6o+PDTtaq
-Y+HkLUm0bNQeWwD85x0cc5DeWmVLWhCHDkHhLlmGMQKBgQDvc3kCm0Ab2AXISsvP
-H3KZy0WwvwwjxNlA9yhbVtZc27gu9Vp9QuTbondQgoCQnkYPRswKKSNEHaQOFh1D
-WHs7W0tk7RXUxrNjoRcyMstyLyXCFWSN/Va9IwJ+C89HVRvvjQA4rjx0ChigmRXF
-bXh7UjRVax84v95iHz45oqxWCwKBgQC2Vx4UhoS6p+eovCVmnyENKmKH0wk+fHvE
-ExLnpc+hKhVZzwdNc4IhvG9R8seBp94RAUzD4ZWED4rqaGR8CaurSCZjrbfyTMrR
-cgrLIuN2oJoKEzHOT73My3K/k/5hde6Fkf2r+pTegJTPwPxzC13qVuqT7fNG8qJ0
-FE8dcKDwxQKBgQC/K97qAM8fK8n6DhVHyOCy/sImCXGEwS1+m5Uhz2OXgWg8PXDA
-Xv7eh4hgw8AnNeXTXn+agRuBz3RiNq+oS+UfD5VS/6IVXYptOXiOgFVDVXb8zB2a
-6y8sE95yibU0SzPhfh42Io1rS4A7/9yM4gh11Lypkbu8kBrZFf6U/1Y93wKBgQCr
-mzvtF1jtjr5guIn+lf72NBC9QeluTJvywfzF1PCe/ktP1Z9Kzk4H0B94oaQQK1u8
-51tG8xTTUAluaUdA0Z0mO2Yd482+FXXAPrNX0QMAj0/J8ZyrTbMUfdkF4pPDR8lv
-HiH+7HuVGLB1AmzVHTqLJLfq90RBXnN0CfUXgPuG/QKBgQCaZgAERj8LTu6a43YB
-s257Las2njADkSurWRDBqEz+lcxjpsPqZV7mguVrjWlXFmw2ztGbqIOG4gHAHFB8
-54fkRyHMORuPCGZ/wdh9xJtmsgunhA9caPADgoNbm39Ex2sKkAjk/DuqStAPm+Tc
-8BaDnfawKGImBgocxWo4xDUyIg==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDZCuzewahfPnCw
+9eT6WQHOJvM6IWvmLjTDLOWHUL+x1GGhRNSuOLbNtwECZK4cUvkGRLEXVyXxGYIT
+qQz5oSXlYRP2e2FVS5LGrPur8yLTiywVE4ycafpYvrtgjCIjGQ5Z7cM59qP2DD5/
+hLHcCGlMcF3erGRj8//y6aPMjJZsrh0FJghHhftMYcRnub3yk9QA8t7KC/LfbJuH
+2eRTwJ2PaQeZbkLMcSEAnbB1xyVuFtcYFvIzGlEAIqq0lLlZZiUVH4LS0yCYUdG0
+rfXU1DsvpBH1Hs01xfvcus/V8LM8ygjRJvzxZ2UjRmuZoD4SUsUi/D/sdClTB++Y
+A2Y0tHV5AgMBAAECggEAAtN27MTuFvoOfZS2ETcXeZey6GQxriLr4kleCQ+uxKH/
+ThpCAAK9CUYDaASSP8wqHJVzDjAUTmSxTOWRRa7TeikexBbXLZp4+XKcfvYA02r8
+fUnD4EWA/PwpdG20BBZPbtxUWReHtaxzI+CWcEcBF/2z5d0DcZ8RC23/Xqp19Z7z
+SP7fUT2lkh73kzJxnprjTK388n1ShKpfpSSNlnMEnqLXIsJ3342fBePu6odfATD0
+bg4M0NrMeuq3zkPeMe4vyqme4kihPwWvzdXevznV0YOKf7Xy0UHzOUJ9wehBT2rc
+L66tp4dXLicEeJyx8vCgOt7UDCZ5YVXH+kUqOXLgAQKBgQDsE7rtZhGdpydxmFjD
+c1lc6hC6yNnArYv278eOmRqHe+Cqco0TlEQ7LA2tKUzpP283wznL1HRUZFztsaxp
+X4DXWAAvjkWfstn+1HFtpmRMnSJP+PFMJ9UrKeZW5UMUqwGo3qKTitt7VBw2s6TP
+DAHdrkYgp44CFViNI4yKXV8sxQKBgQDrW/iccl2FtxEDwsXu+3nk0bJz3IPkzGjz
+I5y3OneQx7HVEmX+nO1TLUaSKP3Gad3voOt9GSn8fmm4t2fGPJTJe+YPskxxzPz5
+0bv1DXZrKuYnaNfyF7Xe74P3nt/aqu5+YnU18D+AKU44NaHdiL5aaDGlk1exsryX
+PVJPdQDZJQKBgH+CsKZlSQKENHPQu7Dl7tCWxG5+6c5+bmj0Xi8RVxjyugiWUsjO
+foQPaVusQRSC5MmTsvX7TNIAW4kvPFa19Ntbds445DY73i8cBCAbjXUsMkpLxdlC
+cosb2IP61N6m9wCFL/7NM3tLlOme4lfKvn9EEDC3D6bkbK3fE5vwjuWZAoGAFrQu
+jVjy8J0yRPya/2y+23XnEwoopv+Y+CttSLeZJRw+aWF2+VLGCgoKDrtpj6RSxnTt
+gonU5QiExk7a8eKSL8WF8emvOiMeHDNBQGhmDfx7az3P5wimgLT2NALdcUif7Q0u
+ZV+hoIlbhEyYKriwNCRs9Z37DadCTgyaThPpWwkCgYBxQ59hMALw+HDVmxwl/kgA
+ETxq4RHwenbGiq8edsaFsnhEd7IPzsaWLrtHZev3Isn42hRATuf1D0+lsYkOIfmW
++xfoE7AepT9sHgjENHO1PfUowt6gENAzGL1jFx2Q6BKShEmGrs1R4A9r/f1jP7uI
+ILk7XSEVQIalAmjW7INPSg==
 -----END PRIVATE KEY-----

test/hostname/Bob.crt

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIBNzANBgkqhkiG9w0BAQ0FADCBmTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRkwFwYD
-VQQKExBIYWhpQ29ycCBUZXN0IENBMQ0wCwYDVQQLEwRUZXN0MREwDwYDVQQDEwhD
-ZXJ0QXV0aDEiMCAGCSqGSIb3DQEJARYTamFtZXNAaGFzaGljb3JwLmNvbTAgFw0y
-MzExMDIxNDE3MTdaGA8yMTIzMTAwOTE0MTcxN1owgYExDDAKBgNVBAMMA0JvYjET
-MBEGA1UECAwKQ2FsaWZvcm5pYTELMAkGA1UEBhMCVVMxKTAnBgkqhkiG9w0BCQEW
-GmRvLW5vdC1yZXBseUBoYXNoaWNvcnAuY29tMRIwEAYDVQQKDAlFbmQgUG9pbnQx
-EDAOBgNVBAsMB1Rlc3RpbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC+03P5VbpuXbEqIE50XqovdLOvevcDR0JD4u5msdPSr3icZJRQDkpWzFEDzTx9
-yt31M2M+q1i3OE5hpjY+X5b3Fxl8oqCKwdAokBvI4Ban1c4rHYFIiXrMUgBz/rWo
-og9nBKU5Wo67kfwUYK2UR+6w5DmeVQj181bspAwynCYMnMfa1zHPfWrw21IPVGiD
-yWZcG+jd7iYuQpVfICy17Vdoor6Jq5sWthSNFUZD7zNo2W7vRRnuH6ooevmvOreU
-VQZjMhUhTgODlNXMkKSXuicD0uyIZ1dFx7pIB7PGmtMxF15fzBYrBe4BqTFricL2
-UsBbUta7qz/pR/H2RzK0eE9pAgMBAAGjgZAwgY0wCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwMwYDVR0RBCwwKoIRc2VydmVyLmRjMS5jb25zdWyCFWJvYi5zZXJ2ZXIu
-ZGMxLmNvbnN1bDAdBgNVHQ4EFgQUQUj5bnFpu96q1GEXeMsYg1bVAbowHwYDVR0j
-BBgwFoAUVX+kaZR3ZYhlAq58L6v0MReLYwEwDQYJKoZIhvcNAQENBQADggEBACuN
-aAKSUX1zp1jXk1sUoyE5bLs/d3UUT5p68SiXK0McnAk+c23gbw6FQaaFNWVVdWI7
-xhteOvqTPiMTXfOq4t7jU2KnbNZkukthzH1b/OFblM1toO4s9I2jQ9DbxTkWlg6c
-f81xqrLwD77Jd327WSrFwCUPC0+vDajASz2yEPnFPeeQ0o4qp44BCUFRkRATJ9Ij
-Phh7O6LskRkZnkMDdCtaYyiEH8fgQLQRrPMFDVbJsdFtaHDdAVVWM7nM5Oi+K8IH
-wRVZo0s1vl++tHmHNJXveNCGJ18ql2pyDyJs18LlX2tiotMepv5dGjS7oLQ7Bc+o
-P2/pkGPk+B1dNVkZzNg=
+MIIEIDCCAwigAwIBAgIBOzANBgkqhkiG9w0BAQ0FADCBjzELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbnNpc2NvMRcwFQYDVQQKDA5I
+YXNoaUNvcnAgVGVzdDENMAsGA1UECwwEVGVzdDERMA8GA1UEAwwIQ2VydEF1dGgx
+IDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMCAXDTIzMTEwMjE2MDcx
+N1oYDzIxMjMxMDA5MTYwNzE3WjCBgTEMMAoGA1UEAwwDQm9iMRMwEQYDVQQIDApD
+YWxpZm9ybmlhMQswCQYDVQQGEwJVUzEpMCcGCSqGSIb3DQEJARYaZG8tbm90LXJl
+cGx5QGhhc2hpY29ycC5jb20xEjAQBgNVBAoMCUVuZCBQb2ludDEQMA4GA1UECwwH
+VGVzdGluZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPfUJGiCFYYG
+uDuhJw16HD0SMvL4FmWY/8GpRWsMceWyIzHpYtj7YYe7uSHTQPfLXUG0IjWMsGDd
+CAo1VYfUlCzISZFcHKlOhdKESVzt27qzBLOM6oJFoarXYslZtKRljGauNHzC5oL3
+WpCnhJ/BOCzRoN7JXuP8zY8eFDCL+DhgWVBNAWfg3UKhv0pmCMSMLbw2UWhVw7Us
+nfXRrsuQENyj3gbdssuwjWvYrEjMdUzeFp6ci3sfiyKKBxTF7yY3M/XWYF3+qecQ
+IvkMbaojg5EuxY4Qrh0MP7yP1GLzT6Z0iGrGw/lkWyh7RGsRJ2yhhjeL7oQUIv71
+6EJ5XwS4aMsCAwEAAaOBkDCBjTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAzBgNV
+HREELDAqghFzZXJ2ZXIuZGMxLmNvbnN1bIIVYm9iLnNlcnZlci5kYzEuY29uc3Vs
+MB0GA1UdDgQWBBR5+mEpMR96/uIp6VKldIgn0XLrhjAfBgNVHSMEGDAWgBQhNwC3
+hy21rb/IaxIV80X9CZeSRjANBgkqhkiG9w0BAQ0FAAOCAQEAf/ChdsjyyA0qFguI
+kyg+UucyJeRYgbn1QmGvT/Cw7Vwc0Cjdt6foOGZ8eUHprwiBIFJn/6uDR7VC7/Sl
+tS+LXW12QYfEsiSNwXuPquZ0yB52bQB7epLZSvm+1mmgV3aj0AxTQwyEoYxCKAlE
+UjuwZgkr0uduEm/xuUdkMqqO1YxiVyrjOd0lYo9qZjiRGNvq1VV/4DiBimzbWV7Q
+Zwv6lCVYwbNUJ7K7y6ZADcQ0t1vrusowO4a5rQzH+C3YtgtwPsR/gj+rsBerJk0c
+bso1DDsupqE7wEGRMohcUyOO7uSCHQksIF5Ej36dIKXHbiRrzMGs3LVOcdYUkqx/
+9Hgp1w==
 -----END CERTIFICATE-----

test/hostname/Bob.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+03P5VbpuXbEq
-IE50XqovdLOvevcDR0JD4u5msdPSr3icZJRQDkpWzFEDzTx9yt31M2M+q1i3OE5h
-pjY+X5b3Fxl8oqCKwdAokBvI4Ban1c4rHYFIiXrMUgBz/rWoog9nBKU5Wo67kfwU
-YK2UR+6w5DmeVQj181bspAwynCYMnMfa1zHPfWrw21IPVGiDyWZcG+jd7iYuQpVf
-ICy17Vdoor6Jq5sWthSNFUZD7zNo2W7vRRnuH6ooevmvOreUVQZjMhUhTgODlNXM
-kKSXuicD0uyIZ1dFx7pIB7PGmtMxF15fzBYrBe4BqTFricL2UsBbUta7qz/pR/H2
-RzK0eE9pAgMBAAECggEAMtd5vcOmgUM7MaMb5AtYwn4QZb+YUmpI8Hdk1z2n1ylj
-NB/kGBRGoCudpiqnZEiJrIu9dHQIlgBNedzj9OhY+4pPAxL9PRr4T+ZdUL7Lqnnf
-jUM2L9JZQljSwBTr53sOKX9mWgqTnsv9YpyDgs9LfBvCcjnrwkPMNA5dJZrO1Gr3
-QWwlS35Uzoyw7z/abTfkP87ojAJbH2f6O5XleBdi4dLFWoec7sj1Xkj5RmhEf+gx
-SJelY33LsPo0apI2YKKjBX4TQ/lvi2AQ/aN3VFBQp+IOfZmPpnlMm6mgagggaa81
-JekSBaTDhHIHH0z6NlKJAJWsW2Vk29e7CEGXAQMjZQKBgQDmF93E0kQqxsbws2Of
-ycS/bsfA7vKyH2BRPx3MpsnmlLCD8+kZIBOY+o2YPlK7kzM7A91051jbgv96bLUP
-4PJJ6GY71Ci2SydRGvDmITHMMnkDqdrrPYmtbWxGfpMyjmneHm03qhz1RZF3XyXW
-SuPQdf3Pp3TFlazxSUbVmoUdjwKBgQDUT8KnzPqdB8tYdexj9XcAvwp2nyN2QsS+
-YHzPfBpZ5QgZ0A2rSaIzr0pUM5h3ie2scCnZByPyilxST8+E6W1En0Hj21H3g3hC
-eSvn7aGSklOk0R45c0yuUZvo2fH7IJ+XBcT4lxD61AbI4Xm0Hel8VYoWaeHR8E+W
-R4HVVFQ3hwKBgQC8ATI+eQQj46l30UwMqsNtG6px9YwuiL6dhDHoHzwHgOS93JVQ
-50m8DLWXeQ0GoR8SEHVp6QJM0jvHn31OTSILy62FIzRkxwGIHrhJgUP8Mh15Jddv
-sSeGokr/SrshawYL7NaWzhO9QSu72u3CrAx7L33Ep3IdY9AckyAitpAf9wKBgGhD
-92ui7dzabBG4b+wzK0sxhvj0dFzqs2ZvSjw3TVWiddT/aQcatU6+ojkx0Ym7Mf7C
-YrrTl+LP8kD2Mwqp/GB7+cbl+Z4dcZzrlxVijTvHIs7JaBd8uUbOi0vSZNUYk2d+
-jNosjkkwgVh76uH64qSN+a/CNgV9CAjcezWCIY3XAoGBANdZR45FezT7bWp6Mfs9
-5s7RjYKC0Yp0hl2elV9I8IgFGu7faV64OodAVxhfLhzORIRrz2SSAHRDaJ4h1T0o
-VfE8bflu4i/KmvYLc5TpKUeSKxxJGmfj/BJKiA/xMCVo9AEFme2jv0pMFHVPiBBa
-GRqHbtRPZnaQim9+qGmWiBWc
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD31CRoghWGBrg7
+oScNehw9EjLy+BZlmP/BqUVrDHHlsiMx6WLY+2GHu7kh00D3y11BtCI1jLBg3QgK
+NVWH1JQsyEmRXBypToXShElc7du6swSzjOqCRaGq12LJWbSkZYxmrjR8wuaC91qQ
+p4SfwTgs0aDeyV7j/M2PHhQwi/g4YFlQTQFn4N1Cob9KZgjEjC28NlFoVcO1LJ31
+0a7LkBDco94G3bLLsI1r2KxIzHVM3haenIt7H4siigcUxe8mNzP11mBd/qnnECL5
+DG2qI4ORLsWOEK4dDD+8j9Ri80+mdIhqxsP5ZFsoe0RrESdsoYY3i+6EFCL+9ehC
+eV8EuGjLAgMBAAECggEAD6o2pO54CtE46vf8PnNV/pw8YTRCQijCHc0jyKjwOBsi
+82AzsdBt8UTx5kvyotcVbXZD5UufyHegLvkBD4Vl2lDMqaX/X8pJVi2rb3bPeUUg
+inLhTdu15NUZdu23J98NWV4wjiRJqsSU0mjsTqbJdLfJadujpliP67h0gT8PsQxy
+MNIoFbhhHDukmLjehL0a5HhH89+aZVxOuvUU9HV8lkpCnNJuajJuwnu5gv/7RUZd
+EG4lZLPTEb3ao9Bnm7/4q1IHQKGC9Cpwaegde3dYYSn5vxoOp87I6wnWxi8V7g0N
+bdNglwCxE9d1hOQ4qefAq3UL6FyAL6wwbo4dNfl3bQKBgQD98vjIy6JdxSYnJOKm
+VuG540uJykFqvqazgl85Vi1z4Ot6AVK1UvnWKWy4bHGiZr5H1R4afPDo/a+H9hoz
+SXv8Vk8/AClcL/u2+czHqNipCssQIkhRfJ1hu3P7zDgVykSxJTrUCoTzHmKBtarn
+kgGQnJC2M44hxFPI26FV0eyyzwKBgQD51IRGdfZT8jw7Bk6f6UFLXV8O7F/pDFs1
+HjUw6+sPselXUSaNk9pIlWr+uTEfwqTG66fLoTFlw0dMzjTejXBiZomZB4Pw0jdF
+ccJj0FvTqi4C6VabHP3S7CSp9eDyaaUDEDn/a8fjG+R08crif+jwTwSHbBdaDbaq
+CArRW6oZRQKBgBmGIUE1TmV0WkhW6bzkQJ3JXZ9Ex9xtux2RvfZqVfkuoxxJI8H7
+zAaddUL4C1fSUc+weO0an7AbR1g4ARwkh6SuHBrt7jpIzFjwtIdgzh33ar99Yp1m
+E/9tstOdDAoMoWjYoBgN0p0I8cettba+sw+Q3O6jMebs76rhgE664bp7AoGAX458
+paK6/DLb/MuVyS5jrhrhoAijSrVSMYgDWlnyR8eJ877zWxWhWT/lc9aLxpUhh4Bd
+ZtKZ3U2K+QKqUDGTOd/0Y1bvjW4qe+JeMuVgKh6eiLiNSrkVENcH0wZb6vyjg/9x
+35NvGhvyDxTowCeihkADAHVEnUo/gtuen6NK9W0CgYAyLd3mTpPUEfvb3SA2oibJ
+j0Z2z4QC85UjoKa/6XKvK31hHABlYdtJLDap5WiXBSGbfZSLRa6bKioQh3a7Skyj
+rWjIFdeAG2M08C+fjD7gci2bEE2zA2juaWYjGlsaQ82uKIvL0YXnYPDFFrubPRhv
+Ut1e3EKg0Ys3N9ngov6A2w==
 -----END PRIVATE KEY-----

test/hostname/Bonnie.crt

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIBOTANBgkqhkiG9w0BAQ0FADCBmTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRkwFwYD
-VQQKExBIYWhpQ29ycCBUZXN0IENBMQ0wCwYDVQQLEwRUZXN0MREwDwYDVQQDEwhD
-ZXJ0QXV0aDEiMCAGCSqGSIb3DQEJARYTamFtZXNAaGFzaGljb3JwLmNvbTAgFw0y
-MzExMDIxNDE3MTdaGA8yMTIzMTAwOTE0MTcxN1owgYQxDzANBgNVBAMMBkJvbm5p
-ZTETMBEGA1UECAwKQ2FsaWZvcm5pYTELMAkGA1UEBhMCVVMxKTAnBgkqhkiG9w0B
-CQEWGmRvLW5vdC1yZXBseUBoYXNoaWNvcnAuY29tMRIwEAYDVQQKDAlFbmQgUG9p
-bnQxEDAOBgNVBAsMB1Rlc3RpbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8j0vJnP8Zhlhirq5DDOipl82Xl/Rwu+4gV+inNGc2EtUKJ+luzYQHBF85
-UqK3qJKM1ihKZ3QmAN5j4yxRusJgWAta/nfP2eR9F6DGJg65+7nBJzgfU/bU3/bT
-p5LLFYx2C1WSDfG1sKkMEAR+ZjLacBzvgFATP4PSQzH+3XSLdaAw0B0J3yBtgFNX
-LtgsXzEoAwZckNbV7ww2Jm3fI7ajQL9VCjNokbymeOH8+IA7go3nLcBOWK8OhB9W
-ihOk7i/3D9ieySitEg7gQtl1OIfPW39Hj7Zypa+3v+8/ns0j3InztemvF35k2daa
-1+/j/VpaPQaqEVvArGcKwYfKtt19AgMBAAGjgZMwgZAwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwNgYDVR0RBC8wLYIRc2VydmVyLmRjMy5jb25zdWyCGGJvbm5pZS5z
-ZXJ2ZXIuZGMzLmNvbnN1bDAdBgNVHQ4EFgQU+JiThRiJsAqfmGVNnfKktsnM63ww
-HwYDVR0jBBgwFoAUVX+kaZR3ZYhlAq58L6v0MReLYwEwDQYJKoZIhvcNAQENBQAD
-ggEBAJQsSUep4bULTESb8C/nS4et9GW1e8yawiRlKJfHWURJRdQynJLSlc0QZk8i
-Qj0QFeAFUD1TjbncJFgEgm8mTnNLiFl1jzvAFcqpGySv7uE1ET6GtP3TEnm81eut
-rXx3gMxXoPQuPbtEfOqruV5sKp/MLUJ21NBFxpWIThQRALAoRZnhUUcIcGOwD3HM
-8U6YC8sLN7M1Hes6VeNpKQ+oJqJMlofiCBkMHpg1qp+KZowdU06PDaDMpTi2ofV8
-8WvpUqDHPP1C1YvrpdvBSBG+bAPgPbgfUe5M2Q9dWTLBQ0TbXP/noX+hyRSVN5Oz
-NqX2f02UOjgp0PkyCSq8Y3nHuxo=
+MIIEJjCCAw6gAwIBAgIBPTANBgkqhkiG9w0BAQ0FADCBjzELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbnNpc2NvMRcwFQYDVQQKDA5I
+YXNoaUNvcnAgVGVzdDENMAsGA1UECwwEVGVzdDERMA8GA1UEAwwIQ2VydEF1dGgx
+IDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMCAXDTIzMTEwMjE2MDcx
+N1oYDzIxMjMxMDA5MTYwNzE3WjCBhDEPMA0GA1UEAwwGQm9ubmllMRMwEQYDVQQI
+DApDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzEpMCcGCSqGSIb3DQEJARYaZG8tbm90
+LXJlcGx5QGhhc2hpY29ycC5jb20xEjAQBgNVBAoMCUVuZCBQb2ludDEQMA4GA1UE
+CwwHVGVzdGluZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8deDJn
+eoCIa0P9rsOuVw9GED2wRZQZwxcWrG+JBtaLczAk1u2zjCG0g5wfQ0WqW8u3wJ3R
+lT6NAcF7m/rMSOBIfja6f1vxzgo6798sp//XLKe5Z4RLO37P+94Mr22P5o3160IW
+mO58jU93C72/oblV/PuToTId5cJjZbsOnRkOb6k+JzaCeXYWtieVhFINLwtxH6te
+7Hv+tWts1mTEkU9xCbSRvmrWkK9AIjQWM0ioOxANLIt7Ca/LvMdw5UyYE1oxAc2X
+2Wwg9EIufmGwyqBhTsKYglvP1qQ2Gsz+XPRDyD143h5yKd2QZLTRcZy8IIitbSTt
+pnRNFy+GxDaMU8cCAwEAAaOBkzCBkDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DA2
+BgNVHREELzAtghFzZXJ2ZXIuZGMzLmNvbnN1bIIYYm9ubmllLnNlcnZlci5kYzMu
+Y29uc3VsMB0GA1UdDgQWBBSWnibIDeJaLeIg8k1QKK1f/qtzUjAfBgNVHSMEGDAW
+gBQhNwC3hy21rb/IaxIV80X9CZeSRjANBgkqhkiG9w0BAQ0FAAOCAQEA2CpX5bIl
+qXXMsDGwoSvJiDRHYzVYIykyo56M8JpIJKca3xLDvb+FlgKKfHBKng5QCnqrSEaf
+B1/1X+bRJBEr5ILmgQB76hCBPqnMDv835DoTkHEYHXqk9sdVjeXoTvMjPHeG+L27
+aL1zz3VAllsQp0aNr7UVDGh3Sny6Lez4G8DRo46zuZnOMgrIPVchfNetP4EkEt0s
++x8aEzbuSnBTw7kWXVBnrj0MMR6pKir/RQz+1YRCMog/FiSo18KgOoTyHSlInT64
+ym4G/NHbXycjxIDWz+wShdFq4BV4dbMtVZqx7InMoauc1+s4oIVXaPs7kXuGqDHW
+AbzLfegInE5sbA==
 -----END CERTIFICATE-----

test/hostname/Bonnie.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC8j0vJnP8Zhlhi
-rq5DDOipl82Xl/Rwu+4gV+inNGc2EtUKJ+luzYQHBF85UqK3qJKM1ihKZ3QmAN5j
-4yxRusJgWAta/nfP2eR9F6DGJg65+7nBJzgfU/bU3/bTp5LLFYx2C1WSDfG1sKkM
-EAR+ZjLacBzvgFATP4PSQzH+3XSLdaAw0B0J3yBtgFNXLtgsXzEoAwZckNbV7ww2
-Jm3fI7ajQL9VCjNokbymeOH8+IA7go3nLcBOWK8OhB9WihOk7i/3D9ieySitEg7g
-Qtl1OIfPW39Hj7Zypa+3v+8/ns0j3InztemvF35k2daa1+/j/VpaPQaqEVvArGcK
-wYfKtt19AgMBAAECggEAUdMfMMDjxJhTj5M9BNS7vCina3Lh/O/YkImFaNWpOkJm
-147lUhN2CTOA/Reai/dnjR08A7msIfe7if4hk9/nDLb4SoblyDlGWXBg8MvAFT4i
-6CpUROgDU3JTIprz7RQPTYRyoDxT2SPt39GtmYpQ5BDFxbrZRNkJo7tMHUzNj9x9
-1v2EJEmryuU5/2Q+gm4GKfjWVBAY245Emax2O6BIZ6/JWw5RGuO34ze3FrNlPHx+
-mfwpvwoelH935Jmw5mLm5UDX1xUTHGOxgOmzFc1dtUPpD7IjtXRAQFhkFlScLXAE
-ZI4vcqmHq88KCNuFMQuYAlJNxH6UonXeFbUqstmiQwKBgQD3qWzHfgGAG607KQ5p
-B5qv4KLzaIRy6o0deiaEak4gSpzti3RMBUtylW+44GG3vcj88Ve8WKzC6tWtG20Q
-47hELeTXlD9nfS//n6dVpG3D8dWsvSW35ukX8H7U3aa1w3U2eJ+OL3stVl2q6Xf+
-O/Q8HapE6TydpEpDMKV5nEdKcwKBgQDC6HnHQ89UvxOPZC70XqW5KkFV4qYn34a/
-X4fQW/Z+AsNlhuxElpAExehlijlEN/uw4nCTIwAKfLKNSfuv3PWxPP0tH1wHigIr
-S7j7RnzqO7pA6+GUuiPe2EZlhpg+GdM5kbP72WbDaM8xilIs9m18LX4qO1I5KErb
-amzHHACMTwKBgCSwn+HqA/TjpMVH7s+Whc8ae2mOCVkw8Fj2mLAzQ4G7LAZxC3ib
-rDK8esGr1C4xWo5GftXzWRzDR4aOspi287x+BBH/72i4fhzjnRmt82j88cfWebkF
-53BZe6CzeZgh7cJ1GkYpOJld2yCP1+v9G9CwIGJ3HzjHdwz/LvSWN2WLAoGAVmdy
-3PhdqEcQp8eU3TY8J2rpDebtG84G0T3LWn36NwCImLCIext3+vW1QZZWLrzWsiKg
-H0or0XpYOTRsBBljPdA4uFEnnhv7PDBUb+hepgQWXIN1PFaMYlTkWEujoBwYvHOw
-I1zMJqKG/4I/Tbls7djJDnW/zKDlFoIGePob8BcCgYBFBatrej1BT0H3FDHbN967
-bt3AmxO6xLY3lB1rxqgBmoGpAvF3Prbus1fKgRezIM3zkuLxlCv7KbQVRbL3fx2H
-n8jM34Gno/RPFtYULva04EDhXeclJxRWGwY/7xbm7k2zlEvWCKskoGAA3H3PkzUI
-BSOKWoogqwXbRCfkuF6PfA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPHXgyZ3qAiGtD
+/a7DrlcPRhA9sEWUGcMXFqxviQbWi3MwJNbts4whtIOcH0NFqlvLt8Cd0ZU+jQHB
+e5v6zEjgSH42un9b8c4KOu/fLKf/1yynuWeESzt+z/veDK9tj+aN9etCFpjufI1P
+dwu9v6G5Vfz7k6EyHeXCY2W7Dp0ZDm+pPic2gnl2FrYnlYRSDS8LcR+rXux7/rVr
+bNZkxJFPcQm0kb5q1pCvQCI0FjNIqDsQDSyLewmvy7zHcOVMmBNaMQHNl9lsIPRC
+Ln5hsMqgYU7CmIJbz9akNhrM/lz0Q8g9eN4ecindkGS00XGcvCCIrW0k7aZ0TRcv
+hsQ2jFPHAgMBAAECggEAK+I0m4ltXVqKT8eqhe+kpqnTux5kP7MNsRCuzJseBcta
+RrMnjwniASo8UJIXMOWduZZfi5DirHQ4EQTd0dADCPKTO4lcfuDHJUfDl2fg2MaA
+wbD5DADcxEvRNAVADljVIvMeO8yJ7s4ZKuMwa6302E4t4igvmWzYR83DulSoWKxi
+uWvgGieOzo/+ke9bGoL84B4x2JrBCsZBil2kuTz2QPzzHcUtYAKRUT7X9pRttYro
+HnegvpkcjHm6oyiSxQbzRL5JlDA+hB5oroNvEvblxLsRtGnO27DD80DoRExn1wqL
+kKgQ7fFCTNkHXR4MRfDdQu35+Yk4EJZaVqEWDs6cwQKBgQDvZZVz3KfmXG26S7WP
+7svDd/0ouksGaJ7EMjM8M2mjoFr8bmf9+YE1A07rr5yLRngy3Y4xxLnNBgHylpHx
+NL3qkkvYtwFd2ONusRUWB50ACGIth59GrEb3GfwaeefLnCIBdnH0/MVVcrF+uOJ1
+tJsUGVj/vwBgdL0SYBT2WxPMtwKBgQDderv01aNlmS82cwNegb8p9f3BNHfT1Tja
+PbOXMJ+hNofMjQ/YwZE2lQq+JGFjr5VvcxAe+u5PU/Ikzhsz/8e3z8s72N4vZD+u
+stWulcXnp8ySGqVmgMBfJwal2ytJfdg00TXbHsI/asW/fMYkNSt/enE1GqZW9nwE
+bGr4X0/BcQKBgDakmkNy90QGjuk6BLxQxmPcjIVyWFOjJ7Iivz0bgx5dKMd7r/Lx
+s4NVOPtk/zdvI1qA5ccIX1yj5Wfo5HEJF9xl/jf+NaqlKeyHMQfxPu3V/ArmbP2l
+ryER5lBoyPbZsY1h6sr/s084ubjyHIa/bbJdwsnFYCGkI9AA7Gf7C/7rAoGBAKTy
+qJMinSuol4H8zHCRPvcYTqGa2vd4IHxhYaRjQS/GtgLAuCGdn/G/tJ2B6MpeVXQI
+hOQdzGhmQ7vniFkE0RBzgJAU5vzys37/j6cTwq3RyciycabSkvMK1KengCiewews
+N+j2koK6mYYQfl0vADNT1IZRT7sKnbiJqm1KRtLxAoGANamO5efOeb6suuwe3mU0
++ti9OxNVOiq4W0sILMb5Lb3uKtipCyhjUzLjzlMwDAOLgrWb7QeHsNCFjhtjQ+K8
+lIf/wznCBzmxybEqB3QSvVMcyC9g5KBXMb0DVOJ3/dUC2p/N4Gednc8rwlxKmmd7
+z3kkUaDQlYWt6UPceWmKz7o=
 -----END PRIVATE KEY-----

test/hostname/CertAuth.crt

@@ -1,28 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEujCCA6KgAwIBAgIJAPjcMEu1o/4sMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2Vs
-ZXMxGTAXBgNVBAoTEEhhaGlDb3JwIFRlc3QgQ0ExDTALBgNVBAsTBFRlc3QxETAP
-BgNVBAMTCENlcnRBdXRoMSIwIAYJKoZIhvcNAQkBFhNqYW1lc0BoYXNoaWNvcnAu
-Y29tMB4XDTE3MDUxMjA1NTAzNloXDTI3MDUxMDA1NTAzNlowgZkxCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtMb3MgQW5nZWxlczEZ
-MBcGA1UEChMQSGFoaUNvcnAgVGVzdCBDQTENMAsGA1UECxMEVGVzdDERMA8GA1UE
-AxMIQ2VydEF1dGgxIjAgBgkqhkiG9w0BCQEWE2phbWVzQGhhc2hpY29ycC5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAnc7C+h+HWU6RsC7dc0dT
-GZp+sIkh/XQT17n8q7P852Epc97yuoIualLWtKih08MgipdGoBq5caPjq4WYKJzk
-TIqXy0DAuuhCXoTfPaizNgS0jqpWMiufjbu7LRh3vaKL9dgtnAQnl2vwHu7IKya7
-VtfUb6kZAxBo5DxD2vGnX+Sgbe66GsvrqrrjDGM0z24d3Tjndq6Vap50ZF+Kz9+M
-XDlu+MAymMipnN5I4SiJOmL1xUpvz49cuW3aKaumMicW3NRGu6lMeSVfxAjADIQW
-oqqJjjqIBJksDoKYuowbJfn6QVd5uW02prEoxMHb8bxhUC6Dx0nkiYnp94Z4WOit
-AgMBAAGjggEBMIH+MB0GA1UdDgQWBBRVf6RplHdliGUCrnwvq/QxF4tjATCBzgYD
-VR0jBIHGMIHDgBRVf6RplHdliGUCrnwvq/QxF4tjAaGBn6SBnDCBmTELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVz
-MRkwFwYDVQQKExBIYWhpQ29ycCBUZXN0IENBMQ0wCwYDVQQLEwRUZXN0MREwDwYD
-VQQDEwhDZXJ0QXV0aDEiMCAGCSqGSIb3DQEJARYTamFtZXNAaGFzaGljb3JwLmNv
-bYIJAPjcMEu1o/4sMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj2
-huhEXrFXMlm/HarFjZm0Di5mq9cmudF5Kq6pDZnfI39d1Y4EgeWMThBHjiCtBT3E
-xQufEa7s7CNQdjAneUhJdYyUAQmnpOzCtl69qexqQHEQws8kBhE0xyzRFpmCSs39
-ZGt9A4Lc6+0XAeIl87oj6spCAbNZOAaNckKMenrZ/MbkPw7HRPoulex2rx1o9oox
-G951WjEk7nJnKAsdQRFnz5DG83Gf8QZcWCnI3Gz3fa8dM1VVa5kuAhk10umDXyEA
-UFEbTg8vR9tCvQHJJCnmCRSrIR53m4773WvxfEXlTT70ITn4FnS1F7kO0RkZ1Ylm
-h8w/4nK2L6XBxgjweiw=
+MIIEATCCAumgAwIBAgIUDkJm2djdx+Z3t1EE3x7sd7KqUAswDQYJKoZIhvcNAQEL
+BQAwgY8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy
+YW5zaXNjbzEXMBUGA1UECgwOSGFzaGlDb3JwIFRlc3QxDTALBgNVBAsMBFRlc3Qx
+ETAPBgNVBAMMCENlcnRBdXRoMSAwHgYJKoZIhvcNAQkBFhF0ZXN0QGludGVybmFs
+LmNvbTAeFw0yMzExMDIxNjA2MzFaFw0zMzEwMzAxNjA2MzFaMIGPMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuc2lzY28xFzAVBgNV
+BAoMDkhhc2hpQ29ycCBUZXN0MQ0wCwYDVQQLDARUZXN0MREwDwYDVQQDDAhDZXJ0
+QXV0aDEgMB4GCSqGSIb3DQEJARYRdGVzdEBpbnRlcm5hbC5jb20wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmNX2YYxysQtt9hx5Vm2SGOmzWGj+rTxRM
+9tFTyHOnnTi55j//+2Uv/o187X8vQgZLHu57C1c0sKuj07IHp2Ewoc/2xjyt3Pu/
+m2Y7wcLMh+ANYlcL2p7FBFaRnkmJ2r2l2Jl47BucUJyOa2KiZZ9eXsYaiMErgtI0
+lAoJBFXtc/w1bQVChrL8TONBmCWmC5Dsb0fxuJbMBthUfyKbaxObL6HWjtB4hHEf
+ObgOLRXzGHhoFM0p4Pby5zb3DTBkb3AOLHwvYf896JeIkG8uK/QD5t+2bL6SP9xY
+smjvq+8FyChRT3qXbekiWJHSaC8S6t6hKtJQ9+1RbaMXEXt16xQBAgMBAAGjUzBR
+MB0GA1UdDgQWBBQhNwC3hy21rb/IaxIV80X9CZeSRjAfBgNVHSMEGDAWgBQhNwC3
+hy21rb/IaxIV80X9CZeSRjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4IBAQAWzKhzVZ7VOyv4c9io+NetBUYRjne04n/TMG3X+hhc9o0Ce22cQlYqXGZ/
+MfmrOeNRSLwv6i7w9K5xBmXOucfXNlWh+L8CSjvcyQWMgsvpwB0NwihgZZphUxBq
+GeU08D4AU1ssyr3mTbZkNdc/nVeFA0kpiAhGBnRaTxo/g52CGnRgJ8QHJx+p639s
+Uif3JY9CPnH2B3PaeEDjqmwiRoJahNUNjT0qvxBkDOy/kqzm6hR3po2HfmzCgjBc
+t39HKGOrrdnIINXkEaW7lXgQc+roKeMjpugFFtjHyzLekmaYUhk29gchEQtELXRm
+4LOUhj7UvGjmqOgyIGeAzwe+49+b
 -----END CERTIFICATE-----

test/hostname/certindex

@@ -10,3 +10,7 @@ V	21231009141716Z		36	unknown	/CN=Alice/ST=California/C=US/emailAddress=do-not-r
 V	21231009141717Z		37	unknown	/CN=Bob/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
 V	21231009141717Z		38	unknown	/CN=Betty/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
 V	21231009141717Z		39	unknown	/CN=Bonnie/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009160717Z		3A	unknown	/CN=Alice/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009160717Z		3B	unknown	/CN=Bob/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009160717Z		3C	unknown	/CN=Betty/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing
+V	21231009160717Z		3D	unknown	/CN=Bonnie/ST=California/C=US/emailAddress=do-not-reply@hashicorp.com/O=End Point/OU=Testing

test/hostname/privkey.pem

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwJ3Owvofh1lOkbAu3XNHUxmafrCJIf10E9e5/Kuz/OdhKXPe
-8rqCLmpS1rSoodPDIIqXRqAauXGj46uFmCic5EyKl8tAwLroQl6E3z2oszYEtI6q
-VjIrn427uy0Yd72ii/XYLZwEJ5dr8B7uyCsmu1bX1G+pGQMQaOQ8Q9rxp1/koG3u
-uhrL66q64wxjNM9uHd0453aulWqedGRfis/fjFw5bvjAMpjIqZzeSOEoiTpi9cVK
-b8+PXLlt2imrpjInFtzURrupTHklX8QIwAyEFqKqiY46iASZLA6CmLqMGyX5+kFX
-ebltNqaxKMTB2/G8YVAug8dJ5ImJ6feGeFjorQIDAQABAoIBACfixcUETHEXojhy
-9lFvJK7ll2NypQL/3ACb5GyZFa1iMHGIB/vVeU2pQLwrLtxL4JUlfcvnLYGHMbvc
-cc6fYlW4L97c/OysB5puvi8IMp3hqrnE7SrqOrRQgjZxUSbCgx1ebESNkSKtrXFM
-xn92yA91HT5lXOvMAaLm2D/o36+bxN/VvSQnYQZFU8fJoMvUBNOdNUlJZock89PL
-E9F1qXrqsex1q9jH7Uykpk9HMSznIhX8s5tMjREa1ZLllaSplP2uQO9DB2dVCqWV
-zp11DQpZB4ukSVVu987OrW6Ic16RLi5jgd41GY792KQE/7ILqU/0iLBidCTXTbOm
-ckBZJyECgYEA4OpVith3ty7YH7VS12hrxql3BaXKk+3rAvXiwdlHlVs9vB61Ugv3
-AiWao88xADt/9NGKQb7oX++7KogE/lZpkE5Gs3s45xcKZDCmfIqyI2ojXPEJR2MR
-reCTAAfDnqiYQtmGRqbObNy/bSRY7urZ94Vv+2Q4NHMkxfBUQMf3lZUCgYEA2zy2
-3XECt4T/ieWx/VSqHeNklG7p2UMiXUlLID1I7Xcx0+7W+g4JscE4+M/d/OCiIknB
-Logd3UfVX1avuvu0HAg6ZqNBlzYfSDLvqtG9ZyfKGZNkPZEu9TivXKo+hG7AaDDw
-yOuvyt7ncUFNI1aXi5iEJrs4TO8+f+WQX2KikLkCgYEAkUnuzk09MED7bag1Bl82
-19MaxrQtY1faa0QpIe3Y1vtkqsPvfzupaWKfPVgXID5PTveY5xWKiIaVEklhaGar
-tINMGp7ryCPTG5ttwJ/bqRLkGyK9SrcNcZPTgb6COFhSW0Sm/7a7PAlxQvCq3lMp
-UEKLbwpzYDZNN+wikOJb5e0CgYAa3ZrPEg0yLgMeg95G2/wow3fM1LalYBuy8Mta
-/QeVyfh6Lxd69wNrG/F+VAKw/VoA96bLq/R07FuSXk4UjMmqcbuuXi0oeYJl15AV
-D7S1EmQqtCwhe0wU0shyg447rlK3sd+fz3nwU1ZrQ4RPY0oY2iy/jku86chv5dLG
-TZD8SQKBgCwz5sHh+X8J5+PxQxBeWfY32Neo1LkWpswFjNYbk7mdzvtMqXmsTn/y
-8CqnXumBYkm//lnigqyA+o8CRZK+NvZAqR5++t7U3R9plFhNWBLjuPVwi7KuWAKw
-M7vyWgYYLTwnd7YwEJlVVGXzLlghs0mONhmgM3iQiOlIfd0DFBc3
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDmNX2YYxysQtt9
+hx5Vm2SGOmzWGj+rTxRM9tFTyHOnnTi55j//+2Uv/o187X8vQgZLHu57C1c0sKuj
+07IHp2Ewoc/2xjyt3Pu/m2Y7wcLMh+ANYlcL2p7FBFaRnkmJ2r2l2Jl47BucUJyO
+a2KiZZ9eXsYaiMErgtI0lAoJBFXtc/w1bQVChrL8TONBmCWmC5Dsb0fxuJbMBthU
+fyKbaxObL6HWjtB4hHEfObgOLRXzGHhoFM0p4Pby5zb3DTBkb3AOLHwvYf896JeI
+kG8uK/QD5t+2bL6SP9xYsmjvq+8FyChRT3qXbekiWJHSaC8S6t6hKtJQ9+1RbaMX
+EXt16xQBAgMBAAECggEAAwLfm/Lt8NXmC5gNHkcMU1In0swgmZPM+u2+krc8RgzB
+LXNU0nseGXjdrmzn3T0imnBy46KkFyEZeaje+wkmNQ3ky8BPkmGh3GGCvpTcALNl
+S5+F7naDXaXfIQP+R8KX+PeimEmUWeDXD2jZrzCfm0snkbjIuBI7wCrQj8oh+ptj
+ro7GCLoERAJQccqCFdhAU1pkO6wHosxQO+/VcP1WJcxHlLZCWgby4GCyUXAESKTH
+A5lHaK2YTRlyX6vgSCVAQ5E/8G7pKw4LQ0jsw8FQBMXFyR9sRqQN6CY7/xdNLGwE
+Rvy9KTFXybX+ERcMzfOhbUu+qXi3BoLF6MKDYGy4fQKBgQD48fEcdTCfNUe55+WH
+h0asZix3ZzzeRbSP62SlhCzbb/QEDCByvhPbAxT4+eTnfI+XfjO/b8+uNuiD36sV
+RaK2DFgdMN2mswWDKh8tXkHmMxkiKODoTEeog1/iwMQ/O4ulDObgzD+E4m2XhXA5
+z7zV5CkM68ALetObym74P3juBQKBgQDsu574jgL8ZumNXBnUvRdprpX1B4fMSR4W
+dvguwNsuy+rMdD/pBywnhQPp0V0YF7OcMPCnm8FoLoUXPwa9RQOzkPGPZGT1ob5T
+9BMGVMgAzMKGQ1lmHnOr5Wf7X2sBLKcQXk9ShC5SnU4dSlIZ2BDhHgKa2cuOJ5ck
+CFi12VGyzQKBgQDrfpQDw6hXM2PCrWgoKQPmGlF+Mp8V9QK2EouHN93nR6SiH4ai
+hMTrraKtVFgB04dSXAQ/2FmyCCc0eOWynckqRcsk8hD7nOZeCf6sQDo+tZ/U/K6l
+kWNIOd7+9jOvTXjwjZ/qj8yWvEvHxmc/iRCtlcRvgKSPN4XuHjWTiRewsQKBgQCQ
+Y/uZdNzjYE3Rl7x1ooP2RLNYSaiNdIdygkvsEFtf1qa236zfkC1hSWNSqQ1UFZjK
+ipsuT/UOe1lYDWwp4z9Xte9wW3asz2OMR1GXSfzXaAy54bhUbfx1ey4KB2/3vmmD
+tVJCbTbn0uSDPwKGmt/ovuot0uuyH/my05hwCkYnfQKBgQDUWns1jJV+pLDMDUYw
+d6wju9UkA7Mpo5zPOLQ3UsdfOJMKBC/xiB93WjJSGfaXkg+QoH2rOfea1l94W1rw
+3xHWFcGR/UHO16UYsH4VGW7kucireMp/WDn4oYjVQJ8viBLdVXtgi7aIQmtMdinu
+p17ypJ/0W7tKm0eowg1N7N1AnQ==
+-----END PRIVATE KEY-----

test/hostname/serialfile

@@ -1 +1 @@
-3A
+3E

test/key/ourdomain.cer

@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIETTCCAzWgAwIBAgIBEjANBgkqhkiG9w0BAQ0FADCBmDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRwwGgYDVQQKExNI
-YXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLEwNEZXYxFjAUBgNVBAMTDXRlc3Qu
-aW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMCAXDTIy
-MTEwMTE1MTMyOVoYDzIxMjIxMDA4MTUxMzI5WjCBjTEYMBYGA1UEAwwPdGVzdGNv
+MIIETTCCAzWgAwIBAgIBKDANBgkqhkiG9w0BAQ0FADCBmDELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMRwwGgYDVQQKDBNI
+YXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLDANEZXYxFjAUBgNVBAMMDXRlc3Qu
+aW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMCAXDTIz
+MTEwMjE3MjAxNloYDzIxMjMxMDA5MTcyMDE2WjCBjTEYMBYGA1UEAwwPdGVzdGNv
 LmludGVybmFsMRMwEQYDVQQIDApDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzEpMCcG
 CSqGSIb3DQEJARYaZG8tbm90LXJlcGx5QGhhc2hpY29ycC5jb20xEjAQBgNVBAoM
 CUVuZCBQb2ludDEQMA4GA1UECwwHVGVzdGluZzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANmKHQFznmOmtmvLSA2/f5xjUmJrscZkYa7ooy5bqkFxBKSa
-cZn+rru0PjuUIElw2r6iOgVSTmWvBd78ej5qS9+xqfOpWUOBOnl2G6uit676Hlzb
-/B/obEek8rmbTYHPT/Lz39oFbmJLc36Wdqp7hq/FMMJd7jEr3r5TIny1eHi1A8Iv
-aTa/2vHpW79YMMkGifTO4NsdXgNXuomgnZgUWesDfDQ4zlQZeMrGT5JO6VcNICuR
-MNCklBqWYONjdG62AePEu8hCePok3qec9ibhCWotqFpEPe+Myu0gCAxhKUVa6GNd
-4iBle1eHbsOsYJcq7aLvujGyixd1EqigqizIvX8CAwEAAaOBqDCBpTAJBgNVHRME
-AjAAMB0GA1UdDgQWBBRNjhD63/a2jm+hawLfWZXrJIBFTDAfBgNVHSMEGDAWgBSj
-+es5+q9t57ZWSVUogWXJARu4lTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
+ggEPADCCAQoCggEBAOR5UJpDbgTsIgDNF6/fcafrPYTZlJnvMmYGxgPBH7lV2qqI
+64yDE03++lLIOwPy8p0JHgCeoCsxRKhOXjaaBjOi3QGQFUU6rl/v8IZFsUo9NIyS
+JJttiJaZCTjzgSZri3PdOHAClP5zF1/aAhTmNf326vAxqkn2MI8yglorOq+CSlOM
+6p9nUGRAsoSvfjmz1vYDoyf4T0ZCUU+ieQ9KbcSVSrMip+r/CekfXglfIygfA+dx
+dSK2Ivp0YjQbsnGEueDOaXMd2HX6Fh93K7IuvGKF2fAHHNl92uhnkbe63aJ7ZYgO
+ftHKvVZFgq6cFFccAuI9qJlk6mo8P+m1ZNfv3dsCAwEAAaOBqDCBpTAJBgNVHRME
+AjAAMB0GA1UdDgQWBBTxigs6/Ob0ULZZeeWqgTrxhfwQRDAfBgNVHSMEGDAWgBTm
+rmqnZIdFOj6vhCUAJKLZNUDwFDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
 BQUHAwEGCCsGAQUFBwMCMCwGA1UdHwQlMCMwIaAfoB2GG2h0dHA6Ly9wYXRoLnRv
-LmNybC9teWNhLmNybDANBgkqhkiG9w0BAQ0FAAOCAQEAHQ5n79cM6G789AGKKjB9
-cbOld9SwzRUzb1MFrG3rs48ZaOp65mdm9zdI2Cmh9SkoT+lOK6+g1wAQ3p22p+2X
-xY3BEFE9gpjdryvR0KFeGkS1fpvIrFAp/cDa67elQR1fX/ADvxSj8GA7gibpS3Ov
-DfuUek8GP7HJEdwM+/0Q6g5qKZcZVb6UU/4WySGkuScukmIxbJTrdtctusthHBp9
-+WJtCHKGnziA0VlWTDCkfX04Mpyixzno4jk1QPdEiOB8PHonvJF7RUsLbuDVv5p2
-SXw4zUgFoTPQ5FuUVN0GInObUJ1IKZ3V4VuAIoTw5kZ165PjLiRRwQuFjLrCmVQR
-AQ==
+LmNybC9teWNhLmNybDANBgkqhkiG9w0BAQ0FAAOCAQEAXS69n70i8mdd2KpUtuVQ
+TqCZPggLJ0ctSzSOVFz3ZFMTg50g3bvMZaK3jdwpL8GH7tMjEZANFaM/QNAJWMVb
+pc0UD1UxdqahNj40I5V5RL/ocYZbzCVcNi6Y5Z9skROHS6/j4OsvCseYRkpVGMkE
+x9bcWJ/cRfLmK9CO8MUrq8gCPYBA1av/uMAot7aT+2rLLcduF5bKuBGGTccVQ01x
+5h+2bmFj8jxpju39HPGvZ7mnOqseVKhbKwE87vxirccM4UkwJDmWNuL7pX4CvwHi
+aDtzDHJws/WPduT/r4eaXjMat7CF42tLP+w4FWNJH/P3UAzHPaPq2i2eHmCcuw4A
+eA==
 -----END CERTIFICATE-----

test/key/ourdomain.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDZih0Bc55jprZr
-y0gNv3+cY1Jia7HGZGGu6KMuW6pBcQSkmnGZ/q67tD47lCBJcNq+ojoFUk5lrwXe
-/Ho+akvfsanzqVlDgTp5dhuroreu+h5c2/wf6GxHpPK5m02Bz0/y89/aBW5iS3N+
-lnaqe4avxTDCXe4xK96+UyJ8tXh4tQPCL2k2v9rx6Vu/WDDJBon0zuDbHV4DV7qJ
-oJ2YFFnrA3w0OM5UGXjKxk+STulXDSArkTDQpJQalmDjY3RutgHjxLvIQnj6JN6n
-nPYm4QlqLahaRD3vjMrtIAgMYSlFWuhjXeIgZXtXh27DrGCXKu2i77oxsosXdRKo
-oKosyL1/AgMBAAECggEAI6qSUN+c82es9wVwPdjM2l4qbrqLfiSNI3k+7+XVhz85
-bKdpwr7P9TR7E5eYp5HaO3ErpB23ftJwWvv4Ku2QnQ9q9ukoGnpAlRN5O+3Ewep+
-OelTcAPSZPi1VxsQXR0ZVZMIe51yWKlYOUQAFrmD/qOM+AEggW1Y6smEmP/Dzb5K
-cILo3+lEMXxc5ffZ8foS4l5ub3mdYvpjW30s+jzAzfPo2gj0CeMAYKQo+ndTlp6C
-3sXPvpgjomq29EBijHCIehiYVj2D1sk0tkfqSzaFcypWfGC8oKTGpUb20aOrcMY2
-hBFGlU0yLntIerja9LhYlFrysa8NPByY1kPLtk6gGQKBgQD4Xnc7FINyn5xR6gN8
-2YjZXlCi4F2oBBsuH0Tkm5GYD6rqLiaEnk5KTEZVHqOgAKQVnGBeEzbx43z/+/EI
-rEXEImjc8nGS/KiBkDiUBPA4QeEIFuUrKmz1cC1ryaTRLn3DQJL0uMuXuwn8Ufn8
-CvU1bVkqbkp6IxbGS/SBrNLxawKBgQDgOSjdCZ8QgiDbjqXgd/XXvuSTRnzKKaaD
-pple5OH8I84CN5WiMztFqRwvL3+XDlxtF8mHg8AoetlmQ/muMBpm0I66AXF0E1UQ
-dV3v10DswRgl1UVFSznR9fDGCRFHSDa4ZErsfE9yvGeNgl3MOHUok0eIYuW4rc13
-lXrpk1JlPQKBgQDAPDWit8Tp4hoW2L6sUp72R2a4OlqjIdJ7x14GZ1awUGgka2YK
-vZCxNwo09csFm5lk1K1OAydC36WvaCxuXxB8t3lckhZQA1jVN3BjONNJZ8wp+7aS
-y3qcGaA+TktQUOCsUH2uBp4mKXGYJ0cKytxx5tnd2pGwqRoGj2GHQOHgUwKBgQCP
-X71jaW2Orsa33cTvfYVzyRp7mczdsDhLYlIbvZtLENH/1O8XYk76QiJFgcfCHWq4
-T0eMIZDT0YoFvF2BJj0blSxOf/G92UbBWWsRm8BmIyp/tpmur2VvfiXRW6byv5hN
-28OU6AAdS5+jesLjfQ5dPZ+19BcUOf5yAuEvTgaXuQKBgQDM47vsNeStbvNvuW2w
-LYCavmz1ci/H1LDStRwMn3kFVT6S30BQZW5WCa9JH1VJPLCZyAsXqMiMqVwbRkrP
-ThY6k+OynaDaEKFURHFZ9TH7QnvAwq0fHRy7nVVUoh5A3I8hqx/lPTyBzJdfEZ/2
-yqxT1bclUFf59IlXukMf/pXxCw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDkeVCaQ24E7CIA
+zRev33Gn6z2E2ZSZ7zJmBsYDwR+5VdqqiOuMgxNN/vpSyDsD8vKdCR4AnqArMUSo
+Tl42mgYzot0BkBVFOq5f7/CGRbFKPTSMkiSbbYiWmQk484Ema4tz3ThwApT+cxdf
+2gIU5jX99urwMapJ9jCPMoJaKzqvgkpTjOqfZ1BkQLKEr345s9b2A6Mn+E9GQlFP
+onkPSm3ElUqzIqfq/wnpH14JXyMoHwPncXUitiL6dGI0G7JxhLngzmlzHdh1+hYf
+dyuyLrxihdnwBxzZfdroZ5G3ut2ie2WIDn7Ryr1WRYKunBRXHALiPaiZZOpqPD/p
+tWTX793bAgMBAAECggEAT6obWEbFwHKjoprgtQLY6v+j6kRBw/D7JkcbWWjICoQs
+pETsuQhlPU94ck/9//EA9o+cxgOJfrYFphf5Utme6vdRT3+xYvvEnJAZ0n/Pgz7X
+KWK13/ov468F37VMZZyfOe27hZbo49Y2osXt7uKcleq4Xbs7kOGGag/nEtC6/EHt
+iFdHkRTJVehdYlkAY4XWaO4JFyksrnA9JW5wtYSlBPzwuW6IOUaDbz2+mYQzoUCu
+c7KyAiO8TWBnxkikc83x0Op8yHTIJrLHoj6EM5X0HNwvuxonlhx1uLrtYbrLLK6z
+M5wMiNYxu73AvRNpWtf3OpMHGhyv6UnYM1uaPVS75QKBgQD/TXTUEgnTefNwIP+/
+liUCbkvUiNYqthcV4ZAbF4lzm8UCHUPErfuogxApTS2m6uD7L1SPCps5Nk5fEFIv
+QzI12avRmPmBdgG4Eo8po/QmP7+DfztGb/2uSmc59Oga2Cu3KzO90V/x4AWCW6LC
+nUNRzMjC3p01VzjtCrA14cFanwKBgQDlGRiZTo2MerQE32TyX3zFp82m++lloKeW
+Zm40rMOe4Lf6DMSxn5m5jlTSXzZrIhPl7iuRBx53D1EUYPSHRULaWMQrHmNzDUTF
+qh5dTQvvmP0UNlSN0iDeXo2E0RloF8vtOqqdMAsMr2U9Tuwj1LrAZFaJMXV+3Uar
+VOAj8cjvRQKBgQCNinXQ9Uc5VY0fh0wC/cz68gdch5ilCVr3KJzqSDxOOfgZWfwu
+WH8DR9Z372/18JZW7ECnJSw1peQBVF0cEtcNf+aAR51cpv4A/VkdruY3JnSZBLrq
+LECqlllwilT8PQjPfkYrYJ8ezCKBySgNWX7vJOfREfZ6kibfVGOpG8ZE5QKBgFv9
+TrZIJ2gP4PbP6I21r7kB3v68ygPHlWM7r+awtD+4Rcc+l0AnMKekMgTivEwaO9ko
+YA/0xtPRr6G6KJWkRuq7l9Eke5Q38LRZ0aVvCWrkiEI0apEjnZUMbFC3UTdNztFr
+rBQ/tUAbsVADv6fHhFE6ONEPrfkJypWDGBj2vdLtAoGBAKqnpHH8rp5GjIk/Kzcl
+mesVx32MCYu8SIYRzgvnkpmrqlntNHE89c/oXIYZI/uDC/KsnZvcaTatlI2uc61K
+WRkwTr7NELU8ZitFqUgfutJjmi2LuIVplYpILA+krQ73z089zDRXM1/QfyOUDPAF
+Xh52im1jJlE68mHaq6bnrVaT
 -----END PRIVATE KEY-----

test/key/ourdomain_server.cer

@@ -1,23 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIDyTCCArGgAwIBAgIURPvvB7dOIjTd54ojjHIw2imSpEgwDQYJKoZIhvcNAQEL
-BQAwgZgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEcMBoGA1UEChMTSGFzaGlDb3JwIFRlc3QgQ2VydDEMMAoGA1UECxMD
-RGV2MRYwFAYDVQQDEw10ZXN0LmludGVybmFsMSAwHgYJKoZIhvcNAQkBFhF0ZXN0
-QGludGVybmFsLmNvbTAeFw0xOTA1MjAxMjE5MDBaFw0yOTA1MTcxMjE5MDBaMAAw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9G2dzg4w9ZqgiINgZJXDV
-7ueWUE42wf6qS8WjdPZVci+ondLI4QTvbGE5wwy5EF/GTRTnVQup3VK8axaNqDqB
-ThBrh7MUMeUgqhnElKxC7tgJOxvKE6JpyAz+e2jXwYMx8wFxDNd9Ve36yA1R6cc1
-T/lupisRl6ARgNOXb/l89fkpM8aHKpwWFFaoXxabsH2Jgnfai2wXLmf7vRnvAM7m
-GwtioWRjt2UCOltZbh/AYL/HVpNeD/IVRaOUHdw72lpAwPHMhvEbqQQkklj4Aldz
-/xs8U82XjyeDhAbeNqAWps2EjFwkmHy+dVSXK9a2hW+Qgw2CQq+By10DmR7rPZWl
-AgMBAAGjgaEwgZ4wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTXwQO3LMRTMtINOYgD
-sMREIqezCTAfBgNVHSMEGDAWgBSj+es5+q9t57ZWSVUogWXJARu4lTAfBgNVHREB
-Af8EFTATghFzZXJ2ZXIuZGMxLmNvbnN1bDANBgkqhkiG9w0BAQsFAAOCAQEAHrvb
-XYi87gpvyrXUCwihHCFDjKdvo+3b9a3MoFzn+/e3gcUwz9fLnup4kGq+Fh+iyitn
-YtraUvFLb0QSZmROTRYRzGwmLLYYOguIcbadRKJkd3NkiJ5QDw4+S8OXE+1/hZpm
-sjM3fnzQPhspxweSZZPtDvgI6JFA8IKCvh2jUfdKdWVfhBonEb/le2ox/7RfqQ+M
-JZ7rorpvSCat+NOQKKIbIAlNcntflXGBE2ken/IHihtUREk5pYKpplMf4PqkyFkB
-MuATqNoXuARYcN3u8HYWv6ewwHqBuUB86NurYArCw3Antl0hJBLDPQ7X8ukJZDoB
-lhe56raXzfZxn9BIrw==
+MIIEBDCCAuygAwIBAgIBJzANBgkqhkiG9w0BAQ0FADCBmDELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMRwwGgYDVQQKDBNI
+YXNoaUNvcnAgVGVzdCBDZXJ0MQwwCgYDVQQLDANEZXYxFjAUBgNVBAMMDXRlc3Qu
+aW50ZXJuYWwxIDAeBgkqhkiG9w0BCQEWEXRlc3RAaW50ZXJuYWwuY29tMCAXDTIz
+MTEwMjE3MTkwOFoYDzIxMjMxMDA5MTcxOTA4WjCBjTEYMBYGA1UEAwwPdGVzdGNv
+LmludGVybmFsMRMwEQYDVQQIDApDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzEpMCcG
+CSqGSIb3DQEJARYaZG8tbm90LXJlcGx5QGhhc2hpY29ycC5jb20xEjAQBgNVBAoM
+CUVuZCBQb2ludDEQMA4GA1UECwwHVGVzdGluZzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKBYr0oa+qozTXeMoQOIWYxhPRfoLJk0YZbMTVoXzIpr0/Vu
+CmMjVxPAzw1bz0mrQCgA66ftkEnn+ieIfrkhtKXeXtWNpvYwpDXlm1dXavAeccDm
+Ik6BWM49WDuZYo7OWsrgh3ia4xRLzhlCyBhK8ckiEeym58nXKNK21KXQD/DKvxlA
+I41WNHJ3hpIIYzxtTLvmv6tEZnmqocfDlbvT/wNVbsuXMVb+tzbwKS9iI7DdWMqe
+IFv9G6h26WijVYcH4pTSAO54933oghguE+WZ8i9FPksCZvYjVKFosr0fALfAGScn
+9kkbbpNM2VJ8s9qfsA1xoPn6Vpm058mc4WQ/rmkCAwEAAaNgMF4wHAYDVR0RBBUw
+E4IRc2VydmVyLmRjMS5jb25zdWwwHQYDVR0OBBYEFNy73y5a0ZSJ8y1G5ujW6KGI
+sEItMB8GA1UdIwQYMBaAFOauaqdkh0U6Pq+EJQAkotk1QPAUMA0GCSqGSIb3DQEB
+DQUAA4IBAQAWc1KXB4fENj5oFgVV3B6U/F9nrxriMqJnYO7SXBlh8gBLIxqK7cBv
+FBye4P35HBceOLUKCOqcIU/rtNzOvDBJkYmolCQ40OAP4QHolzl+dNrGC9ew5VdM
+nACkcWLfYVAIPcaxtagVoR1+zuHq3r08Vf9opGXfUlhnKboHUVmCK8dIvujRzJcE
+4mmgADRB+lDgC4dIX0E/JtY4RrDrd/DUiJ0WDrKKQEpOF3HRkbU9z17SsuniD6K9
+8Y84GchDBKFaCA0jydXF6uyIqfxqkv5DQgfi8CooPY6kEpM3m0DZCca4AwaLNlyt
+rjfbJq847rcN0mvw7GYc8byw5uzoaKlK
 -----END CERTIFICATE-----

test/key/ourdomain_server.cfg

@@ -0,0 +1,22 @@
+[ req ]
+prompt                 = no
+distinguished_name     = dn
+req_extensions = req_ext
+
+
+[dn]
+C = US
+ST = California
+L = Los Angeles
+O = End Point
+OU = Testing
+emailAddress = do-not-reply@hashicorp.com
+CN = testco.internal
+
+[ v3_req ]
+basicConstraints       = CA:false
+extendedKeyUsage       = serverAuth
+subjectAltName         = @alt_names
+
+[alt_names]
+DNS.1 = server.dc1.consul

test/key/ourdomain_server.key

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAvRtnc4OMPWaoIiDYGSVw1e7nllBONsH+qkvFo3T2VXIvqJ3S
-yOEE72xhOcMMuRBfxk0U51ULqd1SvGsWjag6gU4Qa4ezFDHlIKoZxJSsQu7YCTsb
-yhOiacgM/nto18GDMfMBcQzXfVXt+sgNUenHNU/5bqYrEZegEYDTl2/5fPX5KTPG
-hyqcFhRWqF8Wm7B9iYJ32otsFy5n+70Z7wDO5hsLYqFkY7dlAjpbWW4fwGC/x1aT
-Xg/yFUWjlB3cO9paQMDxzIbxG6kEJJJY+AJXc/8bPFPNl48ng4QG3jagFqbNhIxc
-JJh8vnVUlyvWtoVvkIMNgkKvgctdA5ke6z2VpQIDAQABAoIBAEhSerYK0U+KOzMS
-LJMxZn3q6FbsT31Ro/utDuD8klkLWn66HSsGI8UNRgG5PtxoDrjgMeZm+Bb2tfWp
-Xu6+L+HT4SO+uhY3HtHnPAOaeGcAwU6GdJJMAAlEoPOSbv5U27/2l86Mgr1EZ8dJ
-Sw7QwYb6FwLiOgZ4XpdTFZkNEfVf1CeZSlxTIpvlJMJJvVg7crhVnS4boI6d8z24
-b0LerEbvVC97N++sKhSGtSF/QX0wW7BkbTquruaRbWsL/e0o8Bydy1jRVFLTet4l
-GO9MNcN8Cdt7eOptsK00Ma9S9AZfTvaXdrPERimJ0JDtqjMSyfly6M7fK7Yx2gUn
-HcPSOAECgYEAy8IQ5+jw16qJDfAhc9jer5i0E/fj2xohYfUF6IniGFYT9Ih6D/2T
-D55W1m8PSoNM5gfYkLZ6dvjzcF6kDCD5vppVr07B3RlS7caMkM1GGmLxOgX/YIa7
-OpEzaTr1kIefvsrR4c4b2wBzZm1XuGDE/lw5yCQmoBAbzyq4X2Mlr+UCgYEA7Zey
-0vUxCPxBp+spdPuZuH5oW9b2L5D2c87em7+tObuf20wQic7vXfZ4TDTDojSkeEJk
-S7aUKEivzMePdNJ+QYxK+/0w4klYUS62Xk5422zg90dvQ5P86aYHagrQ61jmpUIe
-rthLgP+fHtXEJyb2Ud2fc+yx+Sn38ptWi52AcsECgYBIQe0O4Ouv/5kU6Uhjtc/a
-w7NwtWMHiy+1dlf/DA6zBKuU92UaEJm7WzJ+Xuo0SXXWyYeCYkPxtv1VpypT5snK
-Tx79yVc0mktvaQ7mNvWaW+Yh5oiW6ZCyB1YNBkyZUY9T8McXZak5M+K4uyP1jdOu
-RHR1RmSwNKY4BHVX1mhCBQKBgQCNmuBFw0Uaad5nykzHID2aLBzev9uytd9tXlpm
-0XLY+e5osYkZ2W/ovMEuCjSfNGjiFA/a4FKlP80na7kgk2QUhR0b2ueLttMgb4rZ
-4kM95EKgnr69tDIEv6OjnBawbifpTuMiql813yRjKFzkSOB+ImyqluPr8QuKWPLX
-+2NXAQKBgGAij1zH8M6vV486KA5l4PUyN9iaiakC262IH9bX3js93Wfwd1bGDtQA
-rgxbhQNYifx3ID3HqxyJxWSennczHfEPTfkU4BooFzlqxhKPi+TT+Xd+N+fY5hGT
-S8lS78V8hT8eOEIgGbsM5bckHQqNapGRCNsImIsNftLwmUCSQMDG
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCgWK9KGvqqM013
+jKEDiFmMYT0X6CyZNGGWzE1aF8yKa9P1bgpjI1cTwM8NW89Jq0AoAOun7ZBJ5/on
+iH65IbSl3l7Vjab2MKQ15ZtXV2rwHnHA5iJOgVjOPVg7mWKOzlrK4Id4muMUS84Z
+QsgYSvHJIhHspufJ1yjSttSl0A/wyr8ZQCONVjRyd4aSCGM8bUy75r+rRGZ5qqHH
+w5W70/8DVW7LlzFW/rc28CkvYiOw3VjKniBb/Ruoduloo1WHB+KU0gDuePd96IIY
+LhPlmfIvRT5LAmb2I1ShaLK9HwC3wBknJ/ZJG26TTNlSfLPan7ANcaD5+laZtOfJ
+nOFkP65pAgMBAAECggEACF64v7iKzymgaJYprYKHkiFdTAstkM3ALlv5ybMmVS9t
+wAj/d89Xc0uEQ2FAf8r1rWDm7DwlZQY786ZXXxiYUnQ6JRGg3ocJe1rB8hw5E9Gz
+BGu+7LQpy5I+MdY+4893w9FWoQAMzHlsh7sJsOLwnhwuLVlFDi8yDVXH4ePrgRkv
+DNJ1KFXvD2qJAKclFqQMmLShXy3iDjBQsYsYBZedzysakHhY8fQiQCcAKTnEwtJ1
+XpGF4pJh6o33ZQXVDhTvyaGTO6Sq2Qt+3pS1vMFSmKQFPG7iUnpsVi21a4ZMLFmq
+B/PjTuDBmBSADUFHNRwLoUIrTu8opc5HoWFVp3TzgQKBgQDaIdZHQR40/nW+aa0W
+4owgle9LqXCwwMESbwn7o8BAqVQkzu7C8g9OQ+fzkGVPjkBlQ/CC7zNz3d+/gb2/
+b5mL9ozBluJo37DfYehVSp2jC5SbfGmQanguwZ3ywBr3yM+RN8N4UkY6CJ+PB9I+
+199MjERu4Q6aIKXljRyIxHzLkQKBgQC8LsBK/VbMio/IEZjBLgSM2XiunWIsGd3l
+HVMKNzv5HFmcVX1yVnyaPf6urqH706YkKjGoytTX/OLluxppbF2pHYhOl21c4FfR
+2bMM2ES4WxgjQm2HWKb4oXQf58jdjqSfdgVvnS3rquwjnzODuT9l4GC2ZHdUPBN3
+TISb6d/ZWQKBgQCL8s+mkZnOyD9Etkot95WNxoRr178MN+7nY8RU5X+QPNNWdklr
+W6AER78GXmsReqPIFKm3Z75sJTrLhHL34qLx0HIINkT2oiW5e/hy2FeA5womI9Ea
+raSD4wbyWtwyg2zgr5VCmg6iZyvvuUXjud5zHz88oDodGrs1Jq7a9K1YcQKBgQCO
+VcY4cjpO55ctOrIRm97xMiRn3r68oKwHehCvL2v7VggpiTgjXWtNtwqF0azPrxyB
+SjDZfOFUpQBxxv2JM9/75EyPNVYQ49dI8KLPWl1QHAa71KjHsLRKZsRQxZ5WhmfZ
+/QjLjVWIZXXK08XBIkLjqb089+ySGAaZO5Up4NHhsQKBgH6qHYHQ4x2Py1cZ1RiP
+fwcMMlHA3+Ng1yuSvbwqY73XvIeN6Hhd5BtoFwe2xQJO0iBKI208pBDic1eDAr33
+1WID7atHLJI5eTZZzvnINUPnMi1D3ziohPknatca37cL/3i2JVaVELpmSmr92Tqu
+TSNt6UCeZ2xyyGmUIPzRVmZB
+-----END PRIVATE KEY-----

test/notes.txt

@@ -1 +0,0 @@
-Instructions from https://langui.sh/2009/01/18/openssl-self-signed-ca/

tlsutil/config_test.go

@@ -1484,7 +1484,7 @@ func TestConfigurator_AutoEncryptCert(t *testing.T) {
 	cert, err = loadKeyPair("../test/key/ourdomain.cer", "../test/key/ourdomain.key")
 	require.NoError(t, err)
 	c.autoTLS.cert = cert
-	require.Equal(t, int64(4820915609), c.AutoEncryptCert().NotAfter.Unix())
+	require.Equal(t, int64(4852545616), c.AutoEncryptCert().NotAfter.Unix())
 }
 
 func TestConfigurator_AuthorizeInternalRPCServerConn(t *testing.T) {