diff --git a/embed/config.go b/embed/config.go
index a084f0a07d7..de3df888475 100644
--- a/embed/config.go
+++ b/embed/config.go
@@ -370,11 +370,13 @@ type configJSON struct {
 }
 
 type securityConfig struct {
-	CertFile      string `json:"cert-file"`
-	KeyFile       string `json:"key-file"`
-	CertAuth      bool   `json:"client-cert-auth"`
-	TrustedCAFile string `json:"trusted-ca-file"`
-	AutoTLS       bool   `json:"auto-tls"`
+	CertFile       string `json:"cert-file"`
+	KeyFile        string `json:"key-file"`
+	ClientCertFile string `json:"client-cert-file"`
+	ClientKeyFile  string `json:"client-key-file"`
+	CertAuth       bool   `json:"client-cert-auth"`
+	TrustedCAFile  string `json:"trusted-ca-file"`
+	AutoTLS        bool   `json:"auto-tls"`
 }
 
 // NewConfig creates a new Config populated with default values.
@@ -538,6 +540,8 @@ func (cfg *configYAML) configFromFile(path string) error {
 	copySecurityDetails := func(tls *transport.TLSInfo, ysc *securityConfig) {
 		tls.CertFile = ysc.CertFile
 		tls.KeyFile = ysc.KeyFile
+		tls.ClientCertFile = ysc.ClientCertFile
+		tls.ClientKeyFile = ysc.ClientKeyFile
 		tls.ClientCertAuth = ysc.CertAuth
 		tls.TrustedCAFile = ysc.TrustedCAFile
 	}
diff --git a/etcdmain/config.go b/etcdmain/config.go
index ecb16475e76..96b46577361 100644
--- a/etcdmain/config.go
+++ b/etcdmain/config.go
@@ -199,6 +199,8 @@ func newConfig() *config {
 	// security
 	fs.StringVar(&cfg.ec.ClientTLSInfo.CertFile, "cert-file", "", "Path to the client server TLS cert file.")
 	fs.StringVar(&cfg.ec.ClientTLSInfo.KeyFile, "key-file", "", "Path to the client server TLS key file.")
+	fs.StringVar(&cfg.ec.ClientTLSInfo.ClientCertFile, "client-cert-file", "", "Path to an explicit peer client TLS cert file otherwise cert file will be used when client auth is required.")
+	fs.StringVar(&cfg.ec.ClientTLSInfo.ClientKeyFile, "client-key-file", "", "Path to an explicit peer client TLS key file otherwise key file will be used when client auth is required.")
 	fs.BoolVar(&cfg.ec.ClientTLSInfo.ClientCertAuth, "client-cert-auth", false, "Enable client cert authentication.")
 	fs.StringVar(&cfg.ec.ClientTLSInfo.CRLFile, "client-crl-file", "", "Path to the client certificate revocation list file.")
 	fs.StringVar(&cfg.ec.ClientTLSInfo.AllowedHostname, "client-cert-allowed-hostname", "", "Allowed TLS hostname for client cert authentication.")
@@ -206,6 +208,8 @@ func newConfig() *config {
 	fs.BoolVar(&cfg.ec.ClientAutoTLS, "auto-tls", false, "Client TLS using generated certificates")
 	fs.StringVar(&cfg.ec.PeerTLSInfo.CertFile, "peer-cert-file", "", "Path to the peer server TLS cert file.")
 	fs.StringVar(&cfg.ec.PeerTLSInfo.KeyFile, "peer-key-file", "", "Path to the peer server TLS key file.")
+	fs.StringVar(&cfg.ec.PeerTLSInfo.ClientCertFile, "peer-client-cert-file", "", "Path to an explicit peer client TLS cert file otherwise peer cert file will be used when client auth is required.")
+	fs.StringVar(&cfg.ec.PeerTLSInfo.ClientKeyFile, "peer-client-key-file", "", "Path to an explicit peer client TLS key file otherwise peer key file will be used when client auth is required.")
 	fs.BoolVar(&cfg.ec.PeerTLSInfo.ClientCertAuth, "peer-client-cert-auth", false, "Enable peer client cert authentication.")
 	fs.StringVar(&cfg.ec.PeerTLSInfo.TrustedCAFile, "peer-trusted-ca-file", "", "Path to the peer server TLS trusted CA file.")
 	fs.BoolVar(&cfg.ec.PeerAutoTLS, "peer-auto-tls", false, "Peer TLS using generated certificates")
diff --git a/integration/fixtures/ca.crt b/integration/fixtures/ca.crt
index b0cdbb2fa41..c95a566c60d 100644
--- a/integration/fixtures/ca.crt
+++ b/integration/fixtures/ca.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/client-clientusage.crt b/integration/fixtures/client-clientusage.crt
new file mode 100644
index 00000000000..28802005cdb
--- /dev/null
+++ b/integration/fixtures/client-clientusage.crt
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIECDCCAvCgAwIBAgIUHasLsGp67zGAnqDB8rbfeUk+BfcwDQYJKoZIhvcNAQEL
+BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
+Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl
+Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMTAzMDUxMjEwMDBaFw0zMTAzMDMxMjEw
+MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT
+ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQChWV+pXjvkSC9wOdT9tKM2wP9gJpp7BIG9EmG8hIZMWl2b
+vAyOXc0aNqYoXiDpYUem1klC6Xs5s7INbgmJdP0q8w7XW1kZvOfSX9ODs1LmN4e7
+irnhmgsUdB1x5jnzqeVb0katCnbZr+U0Qr4ROYhsCa95e0kd34qeGm+3uUiqybKa
+02WX3BT8HcT/ulq7tp05aRIQNLyjc4AQoRoRFKMj71hPgvYd7QKOXSy28BxjHlKQ
+dy3D9A0PcLW2siufJh4DwFnwsCyXYjyBcNVd3AHa/ncKtgYWAbJi1DozY0cYur2o
+OlcWtqe+KJDFQc+eEvmmBNWu/cnI/mFttT0RK/HvAgMBAAGjgZIwgY8wDgYDVR0P
+AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYD
+VR0OBBYEFBulc8jtesBMtTj87LSadwA5awR/MB8GA1UdIwQYMBaAFHJuOIffO5UV
+IaSl0zvhWS/61xEbMBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG
+9w0BAQsFAAOCAQEAnch6f6Aw7eh+EvtpigmaKFw6sTVcaKH3TcMREoWUYcCrMrRt
+YD3UO3S/lsxmfWdbO3VtOXX3SaNlDSGsz6OjgEcCx4MQ46WVMtORkZrtov21YJMp
+tekv/+kj5PrPvuSVBQZwID1aYS1+/Q+HNPN2PMfXroWKQ9Co3XCYYje0yLDoQEEB
+33KJb9+3Eg232iHflVPBws+LqQ523bkYIgJW/Aw2dnWpO1KCRTqroCZRco9dtFgU
+eK023coB40DbNVCO7kUuuzTvezHLuvFhOTTT49R6Rv7ad992h2Hz1uHr7MLsajAm
+yKV6tvMbDb7rClK+ySpaDDi2XSRGDLiyAQiKLg==
+-----END CERTIFICATE-----
diff --git a/integration/fixtures/client-clientusage.key.insecure b/integration/fixtures/client-clientusage.key.insecure
new file mode 100644
index 00000000000..077f489a764
--- /dev/null
+++ b/integration/fixtures/client-clientusage.key.insecure
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAoVlfqV475EgvcDnU/bSjNsD/YCaaewSBvRJhvISGTFpdm7wM
+jl3NGjamKF4g6WFHptZJQul7ObOyDW4JiXT9KvMO11tZGbzn0l/Tg7NS5jeHu4q5
+4ZoLFHQdceY586nlW9JGrQp22a/lNEK+ETmIbAmveXtJHd+Knhpvt7lIqsmymtNl
+l9wU/B3E/7pau7adOWkSEDS8o3OAEKEaERSjI+9YT4L2He0Cjl0stvAcYx5SkHct
+w/QND3C1trIrnyYeA8BZ8LAsl2I8gXDVXdwB2v53CrYGFgGyYtQ6M2NHGLq9qDpX
+FranviiQxUHPnhL5pgTVrv3JyP5hbbU9ESvx7wIDAQABAoIBAQCXECVXXmn2pnr7
+uLmou2ogRnwS2rHBwYtyqPYm2XEfpW+E8oBS/pGcHFRe8RohRzodgv1ej1kWwh5P
+Ipn9PzIU9zILAXSfe1UUizFuWgOglZcYSJ8WEPKUuM4kqKfTcVrTKEGRm32A/IU8
+88weNl56wGqw83OWa4fN1PSJ8AiQFQC+y4vvaD7YMU0r2hYqwE7zckarNRgMaEH6
+qFBiT42D6L7s3b+wqIuvCKN7CYOmJyJAh89ybOYnVieypp6Wjkd0akbY+I2TEej0
+SW3o9ooZ+5UJOmjVNUsjtJjNz+6IiNGvoS0kZpPMdv2/F6Bfa5kPIWBQ5KMk5Liz
+9bf42JopAoGBANJogMyZN3Y5MYB4S0MtDjmmWAY13QyEX6oFmic6EuB5sBcTaBjo
+kLQkso9QcU8nxKvw9feBMDCpacpBPf14f2UbV+DyskRZZlJgITX3MRYm98DHiOsD
+kL8RPU5aqn0FZJHnlmX/EsjydgISLimxFPt84muTE4I27C2Qjxkyiuv7AoGBAMRP
+hs8rpK6DgWAQkExYHPCPthJcBdds3+Y8UN7xwlLGH9oDSAio7Khdzs1U4narSlQ4
+UYUfQz49MmkIk1yvxSQ60nC+JLsp1rtsAPSkFZHC+weiCoOZU6xERvnr+Bm9uffd
+lVLNVcIWOt6c5EvZNTavs6IcZSh4EywWmRRVlVudAoGAR/EDWPFqTTnw+wQmd6mI
+G54MqtLv6b+5FeEkfBUXLzlsQ/eWuC2MjIufofDXTUFDtaaF80Jwv7KtQUJdd7Uj
+meZnfbp9yXDn03Ka6GDEn9ZjD78pyXFGpI24cHn/oQ+e+2Q7wFQekCaWws6EiizK
+B9MDd9Sp7vPofQvYYb0uUtECgYBsed1uYRlw7W3yHXT/GrlzHJZpcrwvnBPk73No
+noLYpm43VBTb5CxRpPR/deZl2KUMAMrbGrlXjQ1sCLcVQnNXX8GlVwyI98eWbUnh
+5UGd9/Yq85mHupQH3vqxY3kHEFXQ53p59MjspMgG9v8YAoBrJY/HhpVHVYKSnDIe
+kGQl6QKBgQCuNOYTP6uH6X6G08/riIahviNEa4hTiRVAEJjNpuoNI9I9YHogNRDT
+U+01m+huaZubNf/2VSInl33Mbm+0+Wj6QHNxIxX0hytUPA5mKkE8u116ml5oHEHB
+QLEIEOvWbmGlo6f14vJtUfq8KNRYTf1/UHp0YcUF/VwD/Kv5K1kXXg==
+-----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/gencert.json b/integration/fixtures/gencert.json
index 09b67267bb2..3a88f68d9a9 100644
--- a/integration/fixtures/gencert.json
+++ b/integration/fixtures/gencert.json
@@ -8,6 +8,24 @@
           "client auth"
         ],
         "expiry": "87600h"
+    },
+    "profiles": {
+      "client-only": {
+        "usages": [
+          "signing",
+          "key encipherment",
+          "client auth"
+        ],
+        "expiry": "87600h"
+      },
+      "server-only": {
+        "usages": [
+          "signing",
+          "key encipherment",
+          "server auth"
+        ],
+        "expiry": "87600h"
+      }
     }
   }
 }
diff --git a/integration/fixtures/gencerts.sh b/integration/fixtures/gencerts.sh
index 76e853e77b5..40b0c56a367 100755
--- a/integration/fixtures/gencerts.sh
+++ b/integration/fixtures/gencerts.sh
@@ -25,6 +25,26 @@ cfssl gencert \
 mv server.pem server.crt
 mv server-key.pem server.key.insecure
 
+#generates certificate that only has the 'server auth' usage
+cfssl gencert \
+  --ca ./ca.crt \
+  --ca-key ./ca-key.pem \
+  --config ./gencert.json \
+  --profile=server-only \
+  ./server-ca-csr.json | cfssljson --bare ./server-serverusage
+mv server-serverusage.pem server-serverusage.crt
+mv server-serverusage-key.pem server-serverusage.key.insecure
+
+#generates certificate that only has the 'client auth' usage
+cfssl gencert \
+  --ca ./ca.crt \
+  --ca-key ./ca-key.pem \
+  --config ./gencert.json \
+  --profile=client-only \
+  ./server-ca-csr.json | cfssljson --bare ./client-clientusage
+mv client-clientusage.pem client-clientusage.crt
+mv client-clientusage-key.pem client-clientusage.key.insecure
+
 # generate DNS: localhost, IP: 127.0.0.1, CN: example.com certificates (ECDSA)
 cfssl gencert \
   --ca ./ca.crt \
diff --git a/integration/fixtures/revoke.crl b/integration/fixtures/revoke.crl
index a212b177b5c..1783151491f 100644
Binary files a/integration/fixtures/revoke.crl and b/integration/fixtures/revoke.crl differ
diff --git a/integration/fixtures/server-ecdsa.crt b/integration/fixtures/server-ecdsa.crt
index 0469f4d9125..7eb909a8fcb 100644
--- a/integration/fixtures/server-ecdsa.crt
+++ b/integration/fixtures/server-ecdsa.crt
@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDRzCCAi+gAwIBAgIUKgQJ/CMaFxc4JcwwGyiT/7KpedIwDQYJKoZIhvcNAQEL
+MIIDRzCCAi+gAwIBAgIUT0Q49V3gY0SIVwClKHdjBDzQJqgwDQYJKoZIhvcNAQEL
 BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
 Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl
-Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDgyMTE5MDBaFw0yOTEwMDUyMTE5
+Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMTAzMDUxMjEwMDBaFw0zMTAzMDMxMjEw
 MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
 BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT
 ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjO
-PQMBBwNCAARXbc8naiFZ3Y2LujrnDCScVNRks/TR+aXPmnuPGjDxbuHxSSbC8Q2z
-iTvCkgsIcsifmUIEQcI4v3Kbkj3qMF1so4GcMIGZMA4GA1UdDwEB/wQEAwIFoDAd
+PQMBBwNCAAS8uyoabFyLjBmx5tmFNf8z8e1MvNA0sMGk931CyQ2vSppNrxtU6Ogq
+wc6iy6o9H5FPOnWqajJ13n75qAkGTOZGo4GcMIGZMA4GA1UdDwEB/wQEAwIFoDAd
 BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
-HQ4EFgQU3z1DifT82BfoU5DfMe08meeYmSUwHwYDVR0jBBgwFoAUZQe+r42mchS6
-xFBpug0H8o5jej4wGgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3
-DQEBCwUAA4IBAQAE3bhZcJuGrnMGMgebCFMuAXvoF9twYIHXpxNOg6u0HTIWOsMB
-njEJW/rfZFE/RAJ6JdOMNE2bq2LbJ8dUA25PX3uz6V4omm9B3EvEG9Hh3J+C77XQ
-P+ofiUd+j06SdewoxrmmQmjZZdotpFUQG3EEncs+v94jsamwGNLdq4yWDjFdmyuC
-hqzSkD48aGqP2Q93wfv8uIiCEmJS1vITTm2LxssCLfiYGortpCx32/DWme8nUlni
-1U/pRTx8Brx00dMeruTGjCCpwb8k453oNV6u0D1LsQ9y5DuyEwmZtBEHBN1kVPro
-yYW3/b1jcmZk8W9GXqcXy16LbWmpvJmTHPsj
+HQ4EFgQU6bjNiM/mqEu/sJOD+qsH1M23iZEwHwYDVR0jBBgwFoAUcm44h987lRUh
+pKXTO+FZL/rXERswGgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3
+DQEBCwUAA4IBAQCG4JmdDmJHjxncP8+p+h6b2Pd/N0fotLw5COIyu92V2XNAx7yt
+KsJk1BPJena/CxxU7Bsf0FFNtU+hmkWSUfxFiKplCausK81eVLHWzcd5A6q7vOKy
+7T2WF4jRwmU6Cgz2TFROxfGqbvUmBLoBJFUsXNYxSVyzJGQSgbDLJGAzwra7JjyY
+4t9K1W9RXmC/je+l9m0utW74YFSQ0fOb6Z3ZCLkSnxHy192FYeJ2ViRIUBYOltde
+B8OYZ18y1woWzkqfzoMut5Tc1jHg8/Apa3USXhj1ThaTj0Dh6tn9HCVez8QWl0dE
+TSsbwStelXSjLWQFm3Mw/xAKCt/IaIswjz3t
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server-ecdsa.key.insecure b/integration/fixtures/server-ecdsa.key.insecure
index 7a238685b53..2fe578b6e20 100644
--- a/integration/fixtures/server-ecdsa.key.insecure
+++ b/integration/fixtures/server-ecdsa.key.insecure
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIK3K2gimOw2P0pZ4soFAopriuORuqpRptllFXNRhCRV0oAoGCCqGSM49
-AwEHoUQDQgAEV23PJ2ohWd2Ni7o65wwknFTUZLP00fmlz5p7jxow8W7h8UkmwvEN
-s4k7wpILCHLIn5lCBEHCOL9ym5I96jBdbA==
+MHcCAQEEIGn1PyiUdUgft96jNYtkLvv1dvRVJPmxcReM8p9qICmLoAoGCCqGSM49
+AwEHoUQDQgAEvLsqGmxci4wZsebZhTX/M/HtTLzQNLDBpPd9QskNr0qaTa8bVOjo
+KsHOosuqPR+RTzp1qmoydd5++agJBkzmRg==
 -----END EC PRIVATE KEY-----
diff --git a/integration/fixtures/server-ip.crt b/integration/fixtures/server-ip.crt
index 9666285defd..527c8c0723e 100644
--- a/integration/fixtures/server-ip.crt
+++ b/integration/fixtures/server-ip.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEBzCCAu+gAwIBAgIUSvxuG1lgImYpnaK4sPaCiMAd0lgwDQYJKoZIhvcNAQEL
+MIIEBzCCAu+gAwIBAgIUNBF2hQTCSrLwdqexC1KaDUF4658wDQYJKoZIhvcNAQEL
 BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
 Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl
-Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDgyMTE5MDBaFw0yOTEwMDUyMTE5
+Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMTAzMDUxMjEwMDBaFw0zMTAzMDMxMjEw
 MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
 BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT
 ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC7mJOiyqWfmNM5ptQZ22plotVfgoBf9fHTzMw/ap2Vl0/0
-4V3GEyYCdPt6V87GWzjBSO9GAmlISBQQybMieZTaTm8KKW2066iJDKseBCv9m4nS
-mHv0oDqp3SHsZQ2xHis4lbi7ws2thdqpmjw4Dv96SUiCJUjhcBX4kBMRcOGgk1RF
-ENIOInTSKlAiwNF1NSnhj8wMNw7mjw90jpAGAuPuuiQ7+AYHJBJqtT9mRikR8ppw
-isjEE6kslCCg2RC45AiF4LXNp7A7Xwm6P34XJ6T9PJUh/r3pa0xHRuI2zQLaW8Z/
-b6NYkUGMbHR7AY/+2JzOfnnnQcSB8EYC9bHadvHnAgMBAAGjgZEwgY4wDgYDVR0P
+A4IBDwAwggEKAoIBAQDHVlmvOxWnBbew+27gvWVYppaz9sGC4BfhlPoBJrHbfJrs
+FIUi0iFsJjDSard+ezTJC/Cn0KtQUcJYY+Ln827pn/ORRKpV4jGX8WxcVGU45qqO
+namYvwtOTbXYqVn63vM+SiLWlBcyHgwYfDgklS1fKLE/31Ecfjcsy86kYwncbN4F
+26S2ol/Ey844T2tOCZzG1R+oWMHe0/wwfLhEsgFv51GuGENWwvEjepQOSNhZvdKf
+BAi7LyfQJ+/RE9xfweO7l0FTR68BBppras9OAChZV8Vq3DPy+VjCNrPDiDJTyL7K
+f7ph3pd8h4kmLalRtp82j/9q8azAFGgIE0aQalyTAgMBAAGjgZEwgY4wDgYDVR0P
 AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
-Af8EAjAAMB0GA1UdDgQWBBSPaFA2Jh7s/IJN/Yw/QFFR4pO3nDAfBgNVHSMEGDAW
-gBRlB76vjaZyFLrEUGm6DQfyjmN6PjAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3
-DQEBCwUAA4IBAQAO2EnUXDlZAzOJLmkzQQF/d88PjvzspFtBfj/jCGzK6bpjeZwq
-oM1fQOkjuFeNvVLA3WHVT0XEpZEM8lwAr/YwnBWMFlNd3Vb2Cho5VaQq0nVfhYoB
-tpzoWcf0Qx4cALesQZ3y2EnXePpzky1R4MfHqulYrmZKSBQsERob/7YgSBk+ucV9
-OHLzYxm4OvYvDoR54REq+vgZ3ohoDmBrNNv9OmUHLIrUi+nBpBgnww85Dc7cKB27
-EEKxqIfCNTeHSemvzfK/1M6manQX6eyGe48nOwQMV/ocfY6SeA7RABT0l/UsbeMp
-g/b2RU+liZ3e8FziW4/1VTt1pmFAN/2hnb0v
+Af8EAjAAMB0GA1UdDgQWBBTfkO3xr7d5Kfte7ccj3tdt/WbIjDAfBgNVHSMEGDAW
+gBRybjiH3zuVFSGkpdM74Vkv+tcRGzAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3
+DQEBCwUAA4IBAQAGrK7ttOzLDVUPgQRizKpwNtlV/MXQSBSPF805bvMtPT90lq5c
+HvTqlqP99JV0zQn2h+yrhfB2F5908KuoWbw3I5lxoB0navkaIql8lz/jzr1dcS3Y
+wOpx6h79+htMQnoKLHFPUSzCTUPymXXvkMk5PRTfe3dXk4a7Sw/Y2xtH8mFtep9Q
+MuVJJhTIUmKf6X1CALcoh5cbCh7ChEIhLgZcK9o2s2xZQyWxp6Ms2uNQOHyiaO7y
+sxgDYxuA/xmNL25VhBO0eryE9mJMU2awtHwfxE5Au5OHxJQbesFIw21qd6AMHqYl
+AbgFRzebLA93fArRBpxrlXnyof6A4OHaNVT+
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server-ip.key.insecure b/integration/fixtures/server-ip.key.insecure
index 818c971f8e9..86f5d31bbc4 100644
--- a/integration/fixtures/server-ip.key.insecure
+++ b/integration/fixtures/server-ip.key.insecure
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAu5iTosqln5jTOabUGdtqZaLVX4KAX/Xx08zMP2qdlZdP9OFd
-xhMmAnT7elfOxls4wUjvRgJpSEgUEMmzInmU2k5vCilttOuoiQyrHgQr/ZuJ0ph7
-9KA6qd0h7GUNsR4rOJW4u8LNrYXaqZo8OA7/eklIgiVI4XAV+JATEXDhoJNURRDS
-DiJ00ipQIsDRdTUp4Y/MDDcO5o8PdI6QBgLj7rokO/gGByQSarU/ZkYpEfKacIrI
-xBOpLJQgoNkQuOQIheC1zaewO18Juj9+Fyek/TyVIf696WtMR0biNs0C2lvGf2+j
-WJFBjGx0ewGP/ticzn5550HEgfBGAvWx2nbx5wIDAQABAoIBAB0jBpM7TFwsfWov
-6jOV68Gbd+6cs1m0NnpCDdsvsQgh904+jrUMFlQ9XS3UY45Vbsw+isNh7n5Gi69L
-1KHfJmp90itO4fY+v++BYzaHSVnbhZ2LB32oQVROv00bKPRAjk/8mTO4fv+bkanU
-BdRjJ/UTWsq0BczV/uObZQrJcJHi6+sAMYw4b/kxzTALd+UuvmOP7Z/NoWW6x8Mm
-ahHgqaMwA0O1f4DsdKYnSUVMF9DNGsxKCUYSYR6RH93Bq/Eo0q1U2egmLIMcTVW9
-7QSWsJoZuXlzkq7Hb7mxGdppa6kSzA/VM26qPNE9Cjg4tCMu1RJSfgkcnv27Y8vZ
-fZSq3zkCgYEA68VjIqG6sj43SZSvD+Z+Dfuzc+lO4YBSI0Yru8B4ZZq0vfTVQdM/
-uf0Bpk/nMbqec/kfcPMHP8zznLe8rcmfZXNQFIaajOb6rzWhCRSgbX98MeGnUe/y
-9sG+zFSRrAPDaVRJZwSYILs6o6Hz4o6DBCvr8iKFfm26SLB7hIjwx8UCgYEAy7EL
-dIMdsGDzfmxAYqad3oy/N1KVp96zfdnHEiIC0oiXz3YfI7YLFj54yXxx5rHR2/AK
-wOo7b90Rc8R0PgtKedKrz5p/E0Bz723ToTxHjsqgVRZqYaEKUOp8wR2t2DJOF9b9
-0C/qp6iUy0IOTBYyu3BCMV0aB5kRW62jXJIsQbsCgYB6uO7mOurUFsBug38wNpjM
-rIR3RCz0Afg/NipTe1bwBDwqWEOdFNmp9QEj0ZmU7//EfBsajtXqJsNzgswqZbWb
-eA9p77qItz4rby3YbS0oceByknOmmdCNEsI+15JPyFGyBNaEUgbhmrNmM0mgVu/p
-fvc8vS1hZro9VeelUCaMxQKBgFDgnXHH1fQAqu4ZwX7qNWj2bb5jtjSPgqmH3Tlf
-88rwnYasmjStxb0xVPh7xyYYmQFBUKPE3ZDPMGzNJnK0PQAeHEY0TByyzNXWv98X
-djpGTl86pUbakKQMVzi+thZP8x4YKXOOcxfbIimKsu6XKdGvAzlihEFcD75dNa4+
-BACdAoGBAJevnrC7M/KyDDGW3ci4sFcn7MxRGqLBulwGoCuM+zecbG7NBvDynoaH
-NRGpASiboRJyCEoIQivvkZf+K7L/oB4bL/ThF2ZpJUe471tq0444xnXdHRDLG0Dw
-OnBl27e3iAiUctqR51ufXKOUaNEf4gcsS9duELMPBxM70GE2Q/2r
+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
 -----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/server-ipv6.crt b/integration/fixtures/server-ipv6.crt
index 96d74aa4493..a443574c6e3 100644
--- a/integration/fixtures/server-ipv6.crt
+++ b/integration/fixtures/server-ipv6.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-A4IBDwAwggEKAoIBAQDcRWZxskwCNXhprj8XCtkxj9GP4z9hVgUxgquSBync1hic
-or6qNgrUztv6nlALdQdf+TbPKyGEwCgAlKU/hnJK6lAG3+riyShnyM74/ulV1wYS
-F3Rkeh0nNCo95TPNq4GLB+sMfzwoSsT0srPX7KzCqpGy+G7sB0JBNwkTZLkCuMZf
-dkkmcZJ3zqIiOzJPlcQa4iBa0L1nV3Uuv49kLZLMCLMslg//IZxC09fnmjn+XLcV
-4+RpOKIn7AMN1kqPqmaB6gk2aCbYTZZ8aS9+cOJmTERbynyX4y4sRV18ED3dRNvs
-HCedgPOp53nqDneSOqOhhg+Mb95tnMQq1on0+TRDAgMBAAGjgZ0wgZowDgYDVR0P
+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
-Af8EAjAAMB0GA1UdDgQWBBTFoXLQVq+Yg2AlRIirXj5ho0PMrjAfBgNVHSMEGDAW
-gBRlB76vjaZyFLrEUGm6DQfyjmN6PjAbBgNVHREEFDAShxAAAAAAAAAAAAAAAAAA
-AAABMA0GCSqGSIb3DQEBCwUAA4IBAQB4bl4f8TI7k+nlHe4MhJuHP1BKHB5O5SeG
-wrgI2+qV38UrKvTag2Z3OVKw12ANGN1vcOUrDS7cCtIZ8Aar7JpBgWrYvVlhAtc5
-3syj74Iapg1Prc0PFRmMQTZ4mahRHEqUTm3rdzkwMjNDekBs9yyBsKa08Qrm9+Cz
-Z84k/cQTBc3Bg6Xw3vUiL4EmeRQudBQAvh/vdxj6X+fwKmvLbPpgogXuQS/lHhFQ
-/rZ+s22RHLlqzAMuordjxS4Nw91dqYFwdYVvEmsK89ZnSWqwLvFCJ4uNnAe8siS7
-53YTpGbpLdNkQKAQJdMQSyvcDbQoQ7FI19a1EtSwpg5qSMOTpQ/C
+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
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server-ipv6.key.insecure b/integration/fixtures/server-ipv6.key.insecure
index bc8963115a3..39396bca7f3 100644
--- a/integration/fixtures/server-ipv6.key.insecure
+++ b/integration/fixtures/server-ipv6.key.insecure
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/server-revoked.crt b/integration/fixtures/server-revoked.crt
index 556c77cd675..cd7043427fd 100644
--- a/integration/fixtures/server-revoked.crt
+++ b/integration/fixtures/server-revoked.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server-revoked.key.insecure b/integration/fixtures/server-revoked.key.insecure
index 3da1955d7f0..2d1bb13965c 100644
--- a/integration/fixtures/server-revoked.key.insecure
+++ b/integration/fixtures/server-revoked.key.insecure
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/server-serverusage.crt b/integration/fixtures/server-serverusage.crt
new file mode 100644
index 00000000000..11cec8dbd6b
--- /dev/null
+++ b/integration/fixtures/server-serverusage.crt
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIECDCCAvCgAwIBAgIUf8yF0aQgWWhox5ofKcm+Xk5kqNwwDQYJKoZIhvcNAQEL
+BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
+Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl
+Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMTAzMDUxMjEwMDBaFw0zMTAzMDMxMjEw
+MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT
+ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDyK8KchIjvtnsUThNvwAAX2BV2uM8p6lmFckp7hs8bKqWX
+z3tbCbGYbR9gNclP1o3keAiP6VshOMXSL9W+Mw+2ni7gIw02xfoPvF0xgrY+2RNq
+lnp8Nazhg+A0TGGulbqcoQCHebToJixb67FBUiQFPxJKh82RFd3tVIP1YVeoQlKS
+8NbYmL1m/uroduf0WLbGB+KNDO7usJoSTKBILB9en0z/Nteh8yoJU1QC+BnA22Tf
+hIM+sAP+UZNA0f3NqAswXkK+ymFKiGI2qktFEok7cgNcktc0Q/D/RkyJLqs4NiRP
+KFlzDOAODnRKUXX8mp+296jlg6lds2NcuDFKVZznAgMBAAGjgZIwgY8wDgYDVR0P
+AQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwHQYD
+VR0OBBYEFG9Btj0FdraMJN37870P9X5CkEjxMB8GA1UdIwQYMBaAFHJuOIffO5UV
+IaSl0zvhWS/61xEbMBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG
+9w0BAQsFAAOCAQEAkZB7jSZymHsQYsYZOMEpyrIZtFEm8hkXg2e/FwtyRIgwLmh/
+oZ7hvFe0h6ndS5OqureepKc0Kh5LXxuCJs7TO88BY3hDFPG2PoEWPKfjIkJuT05n
+mlulaaSNq+KSXCMO5yFFVJ+aIV9lcB1cWg/feaw3c80CfLde8pnldzBf9VmAiH5o
+7JYU/LyM8TIGmBxPbRdr3LOTplqoTB/I4T4xRaqd2Hh3AXwyCflLWotZ/fhH/XOo
+ze0GMWVEi9zWy5m2GiTTrKxPuEyCRANb7gFeoRjEsLMGcJg+J8s8mjImWVqLsR85
+Xi6G03UrRzvDwwtFascKZVVUJVO3IMjxuAYL6A==
+-----END CERTIFICATE-----
diff --git a/integration/fixtures/server-serverusage.key.insecure b/integration/fixtures/server-serverusage.key.insecure
new file mode 100644
index 00000000000..94c8650394b
--- /dev/null
+++ b/integration/fixtures/server-serverusage.key.insecure
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA8ivCnISI77Z7FE4Tb8AAF9gVdrjPKepZhXJKe4bPGyqll897
+WwmxmG0fYDXJT9aN5HgIj+lbITjF0i/VvjMPtp4u4CMNNsX6D7xdMYK2PtkTapZ6
+fDWs4YPgNExhrpW6nKEAh3m06CYsW+uxQVIkBT8SSofNkRXd7VSD9WFXqEJSkvDW
+2Ji9Zv7q6Hbn9Fi2xgfijQzu7rCaEkygSCwfXp9M/zbXofMqCVNUAvgZwNtk34SD
+PrAD/lGTQNH9zagLMF5CvsphSohiNqpLRRKJO3IDXJLXNEPw/0ZMiS6rODYkTyhZ
+cwzgDg50SlF1/Jqftveo5YOpXbNjXLgxSlWc5wIDAQABAoIBAHyqDEfYbknATYG5
+Y4YOd73OjdYM8xAnxKfOmwsV7b2VaaNJur21sse9vP4hEh3YXDj1larHvRLQD/3Q
+hB6iWH9w1L6rLJ06syywkeTv3fNief1Ps4QHeZSp95vUiiB+kY8ZzpTvETLEm+dB
+4IC40TQmMLtPR4JdmF4ZOMjzsFU7trv277eYVTwAX5MOaeLzDZ4JPQdfvC84bEXd
+nB/1uwXP057ts6q1EzBeVIEzofgOzyPpE5rzSUXzzvsoeiC1BC7ZwljHoHkfFuQT
+wq9xQt+3gTUMVPU6gYr9M/6Fy1DM7MFinLGD39LGH5zddvaThd1LPCJnYMyZzepx
+cwl+HUECgYEA+v7ZnmFtcQXFAEirkKqOzbzaB6MpMNr1ZGYbnXqTNODw/sIdQ+0m
+SWiIgjc0UFPJh/7qee7JmHXvQZpa8WvkDWH9jhOu2b2Zm7Vk+AC5zGVVzIsKLU/x
+U3WKeIgzimNCl3N2blrtttSFtK9KLDCzOPMNn9a0gLeGmuwOo6iDp8cCgYEA9v/d
++nGhIqhn2bzF+/R70Rg+G73lQ3ItBRtGT5NExYZwTrf03mh3ROqwXFnMRtB140LV
+8MmCBxZPuJNazaJqSSBxjrN0ZFQUDkHA3noUE/p2Q0Yi3n748Nv5vVkK5cbT/LB6
+WZtBThFTP9ZMcKPER8L82cOPyAenn3hS0zsNoeECgYBBWin/ew6r5vysXj+No1sb
+Zpi+dFU9S0Wppox6LHg3xHn7Wz+TeCQH6RfiD82nPKm0p0MWDH6hG9P4GOClC5qN
+gX4riCR2vU9Jo6luiYHXHmuAnpM/yRjkyi4LxCrnVYD5Pi8P/Mz4Vc2ahimh5+xC
+X8akX5sQCLkbjWsiYbYl8QKBgQCQhjiRkSlSyS0y51UFTxGf0EqPGvbqFwWmpkXm
+y+oCld5jARpjhMa86YHWF6kCinlgR7w9DvtpQDHXc0k/Z1g/f59Se0iQZ+3wRaMf
+ylizM+s9A+3lOHBbJqujklVhC40AnxaIFeMJVfPbN340rm5r+vjORrJ7vZbkJZh5
+BmW8oQKBgBquIUFbf9SRP1zPXtHF/cQq7afkY1+BxpdHNlHF5yRkziVwp7ZUO2/q
+Qg62j63A52msV2oqLPyBGcrvMo6UbC62NaPYtg6OBl7vjT7F4RaAnrJ2Ed+U9Ze5
+85keWKIkzo3X3Y2QKWxfDhrg8WkNQMZWYx1RsRICVxovkZqZQ4mj
+-----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/server-wildcard.crt b/integration/fixtures/server-wildcard.crt
index 123356a49f1..c2e30acef87 100644
--- a/integration/fixtures/server-wildcard.crt
+++ b/integration/fixtures/server-wildcard.crt
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-A4IBDwAwggEKAoIBAQDPAGzCcM5JSlitl/iHLYJ6eGO8MJ3S6R1qzAvmdB9+KsGD
-F99gWVTrJRzz/hJyo9Lt8GvNj9Ll3iT2QnXyyaSOX1+uT4cxBM2MFBBfERDh0WUY
-43uLQKY45H4zrS4tJTOuSGKM/LlK2ZMj++pQBqHsONrNG+nOhqe3qLqPDV3yBfmD
-PXfjASNvHINgxb9AwQWJydgjfGDiAwWHnKbnVScYBFgWfMG0Gm1wa8EfRfWD0NPd
-L61XwQwgb5VsYAs7XH7bxVbPm6E+/oQTOJXQHMzQYve9DFPy62KFSIkfvNwVRctL
-NE+k3HnyviDzbs387ys56ZjPG1/XpbFmeQuDRndJAgMBAAGjgbYwgbMwDgYDVR0P
+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
-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
+Af8EAjAAMB0GA1UdDgQWBBQhpirP+xuXWdjIjLy3v6tJpC7OQDAfBgNVHSMEGDAW
+gBRybjiH3zuVFSGkpdM74Vkv+tcRGzA0BgNVHREELTArggwqLmV0Y2QubG9jYWyC
 CmV0Y2QubG9jYWyCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEA
-sc0JnS1udx4HFStcPZXY+kyVwYPuRDv3GisO+TTrxzdupQQl4gPmuGa/cik4tKxQ
-o//XFgCBQCapO2cY+JerjMSOLHtt4YmdyYDSXeMjsRG0sP36njH3nHIYsFAoEyvg
-nJQX7iDWj/9bzMT4dU2ac3t9RgCtyABRoT4G/MNhWMlJt9XkwVTN2Pqf4TMV0GlV
-54GOScsWAIwoIDPOCoO8Q40jtFSSnehrlrW7x6B37gY/EbbYpZNrIDNckNfLJMvl
-dak9P/ovtjLk8GM11gE4s2ANWA3o5bIm17b1x7Fw122sB4Rxptbc/BDpv2GIY5Zm
-tqDculro2C7Ib5GyEBEl3Q==
+JtMUwpvw9Qa4XofPT7q2xmqRv+SSFNsoSlidyihp1vFtB4RJxDDFAriTqpEc2xrQ
+xj71LRL8dNnV/MDguPfAYsYMY5wP0lhocJDXabkk1MaDtVlbhUS8bFETA53864zQ
+Ghu3WrQEhR8adXmccANVs3P4VunLbDHfXB5x5+gL6SrjHSIyo6jcVr9WFIuizTH5
+VjQrR2UMGoCSXE7T0N+WDjel7QofjTyVvPY3KDGSG3qi5oS4IJdYtI+qhsKBwskn
+WrNhwiH68t/TB7XRbTdbbjDyoknSuXo1UsBBrUHKKW7Nfme2iR0PvO9SZW5UEQaO
+yBAXRO5WFahZ8wljUPEQ4Q==
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server-wildcard.key.insecure b/integration/fixtures/server-wildcard.key.insecure
index 6a292ccef68..0ffd4bc29d8 100644
--- a/integration/fixtures/server-wildcard.key.insecure
+++ b/integration/fixtures/server-wildcard.key.insecure
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/server.crt b/integration/fixtures/server.crt
index 00706ac0855..da9df8d7da2 100644
--- a/integration/fixtures/server.crt
+++ b/integration/fixtures/server.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEEjCCAvqgAwIBAgIUdUecO/Un2wfrJXsZRGkX2zFkK7wwDQYJKoZIhvcNAQEL
+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
-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
+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
-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
+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
-Af8EAjAAMB0GA1UdDgQWBBQtNVqbrSLEx7TA7E4KhsH4h8NRhTAfBgNVHSMEGDAW
-gBRlB76vjaZyFLrEUGm6DQfyjmN6PjAaBgNVHREEEzARgglsb2NhbGhvc3SHBH8A
-AAEwDQYJKoZIhvcNAQELBQADggEBAFdeFLblwKDjQ/aTUe0XhsjI7IdKc+tQujrV
-uU15FtRzA977ntJCYhaYyNpTBjOo65C/UOyZK/ZD6vI6vH2ENRvCgZUIInmfKw2X
-w7TbTHKTDZqbnKVKqORx2+S8NBaE7KSPae+Q0zQbHLyv5btBcRGv8MECGsi+pjP8
-EiJM4VMQ9obziCtWl0j/BOY+YSgjIAR9huyJEA6RibCoNhjCaSSSzNqIEzpCh3zh
-6zR0NzQbC3z+B6IGWzvnPBbrc2LH+eqywSlswVy1Thp2btU8b21WcjIqlcuL4Q1u
-NmHmq8K2zLLvYQ3voLYzxbeMlsuZjCI2/UJSNKOSGlmlNswHy18=
+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
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server.key.insecure b/integration/fixtures/server.key.insecure
index 93d344980df..4f97d54a323 100644
--- a/integration/fixtures/server.key.insecure
+++ b/integration/fixtures/server.key.insecure
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAoAlF9DI6KPXHJMsyvjnRWlF1sgetqZPrUYu+Dgj3spuepyBf
-nkHdJZWwSeAHyurnYXO+gfnhhbv7YGq6GXdz1yagQleZ/hHFEmMQoVmcG25lb5r+
-n6/ZHYSTWhdCyeSI6ze21Vh8CJBELGsbPudDN8j8bIwvjnEhkfrkhc/YH9nuvm82
-L7psZL9B7iB5zydXzyZ+Q8ruqHYz46Kio2N6KVSLjFMq7QJa/17Dg18Vi4aEPCpB
-BmQPhKw4ladvazR+QHysrahfoiT8ynB5OX7SDWEcePNjYCTlq2mNo/iqypL/k27/
-WVUNxhBB73bcZY1D13hcGP6g6MUBQ1jr20v/CQIDAQABAoIBAD5l/zmMj/LCiehF
-tj5HauJtWpeUuNiizSDZfLwaMQIZ/U0qqT2abrCl4bucN02eM6Nirsgc9xrexc+9
-LVyan7cm31uernNK2G0n5ScUOnLTo4dVhqwas2v38kAxS6BOlDgqXAZpXssz/PDY
-viHTp/jLS+jC7BP89lrl2U53UMxx3em+FIdWmZ54wNcLrxD585Ibcu2ajRS2PQT9
-szh8W0fEkyKCk1MOhCMFvXOuO34BqO7kMev1QTQFQ5QeriQU/XB1MWFwKldX9C3b
-0l5c4zJ1msTXpm/IyD21JtYfCJiH3Ny3Ojl864Ud5pdG0xQ2d4qHE6fvSRvzz9aG
-wAntmFUCgYEAxW4BZctTwrNMZwrXV4kNKBhkh6zl4BMxMexB0ze0N3aJmPEAcJUb
-7uoT6YiN3XA7DBRYOf7MmcpcLyqJi5Yt9T24xGIbU50jgxMw1KMIHf0lbGKQxDJN
-mdvLKM56O137qvnhaRYOX73pq2+DWD4UT1C/SWF+dkMTuG5aRz94h78CgYEAz4Nh
-8IRZMET+7dg66qpGqZ37Y2igANrxvMwKmY9VlAbHRZu3fpt8WwQ2Vs4CFk/rfmbI
-5H6mAUVu8pKYvi910wWvLlPPh/34Sxoj4TJ6QRlP0pD3Um8O/PYa/0joNlf/rZjw
-6O/7UkXjzubOUHqcEnYWEm+oym2e0Av/8yLWazcCgYAvZgej3rrPRaiUHIAync6w
-z5pjEFloAHORHr127iqwHh9Ovp1yafn40+3P5V7ZyPYEImZEFi4cxf53vGilQHrs
-I9NWIo+Y9WLvNw5EHpf2Sy5O5SMIV2NWCvStaVTjJ98h3zgEuKzew4N0CyOnbdAG
-csZZ4bQwxE3Zu3SlIlHXlQKBgQCabEj79WFxvEaBtMHTU7eWDcy/o2I+gLAYMTdK
-IxIqQAkW0dRxUT/vc2kEm/WNqRe0TsT81QqwM31m4pTsIuFpkfdVYGU17FdTfDZr
-JWc4/p8aMWr7W04qDPL2Oskjd8T66K+OiNfb18q5c6Tg2v0998ZhHdrcGUtvwx5L
-TweFbQKBgFOC+y+2mVhlKyUxibiGmN8LAmnFYmaFyHgvQDCOOIpo0VAILf8LyEQf
-EYQteM3us92jBUOuZ8NMUaI2sBCzaLPpZTkL02iIr13Y0IYtu0LgIfI157kXjoow
-ByRl9TClp9RAkmbJVCxDsgR9nJVW1L1cCw8M1p5+n9SQMJFUQghW
+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
 -----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/server2.crt b/integration/fixtures/server2.crt
index 14e8f285cdc..ccfe70509c9 100644
--- a/integration/fixtures/server2.crt
+++ b/integration/fixtures/server2.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server2.key.insecure b/integration/fixtures/server2.key.insecure
index 4611870135f..3d39ce5ccf7 100644
--- a/integration/fixtures/server2.key.insecure
+++ b/integration/fixtures/server2.key.insecure
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAv6FwE/OeAwAmZutb+DTP+y7FKpONm0+aHtESlrmTRmDoiLGu
-oEXjYcFOCHr6gQJTYKEAivBK3TIN0dRirNBqLQxssDlsbU4ZXG++OciH/OoR8E+V
-mMsbqof/E0nhVFYDumnuoS+waX8elzuDjDX4u7F+d1/gIb8aYU1VDjtZxF2bvqaP
-yroOn5HvBs4MW+BpAB4guHfDXpK/oAnJDsq9JTUZqoG1xOZfHNhA/iVBSAJvhO6a
-BxDCjzwO1gT5kTbNELrBCJ0V2NXlHFcBOPhxyl4+DIPwa0Q8oExUEOzxnHFuU3GP
-oklbLp0RNNiqHHKfD4yaLI1rf8dH5AZG/QjK4wIDAQABAoIBAE5QTHxq4BV71zXS
-U7ig5KpTV9JpkMJ7CpIzgTRFzNFDQ2SxsJrhVOabWCeREpTsfWSNB6rAPugcz5cE
-A/t6BRo57KUsIoqdEzI6nHQC5shOZFxgOdPClaDgiTa5x7Nun4FsT1BiK+dBQyAs
-+zqux+L0y6k/blp8Peyr7OmvCaV8osB4/JLLH/WHt2wWgqFWisyIT7/D/gQlQn81
-Hvv84BAL9y8iyCmCzWhQL0YisLPyaFkGkb7DK4wznWxfQn3jRAkZDQMH675o/OHj
-8nL0NSdCA/MGLEtPAXegM7kMPCf68JwZV3gPZDyEK0JES1oT1z+op7JHuatlhgdL
-WTA10fkCgYEA1QXRRpOeZvHzGVMzrXrrgS5GeaR+XgjUalBGgu0w8nSET195oXu6
-Y8dVco4FlEZ0Wq7evA4M9XVJyKQkkEGR7Nkv922p8RhG+U73ajODANAQURIwqOPJ
-01IrfMIK2mkXDZwzkAxPaOnny2OMZtUznmZnNdJ/vLd7U0sScNPVQp8CgYEA5krD
-ImQ8U9/S4VOK78i3FMWMoutffXpW71lEc9tsz1YWUPf170raujjF5mqtBBXup9ko
-37CmVk6mOO2TdXLg1feMaVBsoblL6iPoBZot/fLdzgmICccpimst2yrUZEHwJpdk
-9k95xEZUQhN73eY/Ih6b5HZZ/ygxfAVvhDFzNT0CgYEAru5aDvUGbU9e7HsQwvNg
-FfMkWJwmUZ46oRtO7BFP0qqwRGYJAf0S8QEuQCY0mrDIt/dGXXPEXIV2k9eHVxch
-eDhaVXuuxJfFINIiBwpKGA7Ed27Smr6EbI7bu1W1h+oozjppdW9GfscmXDVhhMir
-3PYG54H298hM8/eAKzsps80CgYEAzk5Vp76ySNVv3spv4kYmtaYQSnef8RIjRYLs
-DvqY7NmLXnf0y618a22m5LfWTZ20Uov50QM40ILe6Ir1GjeS8jw1frc8yljsiFIo
-brRj1We4ivcA9vmD3mwMBZbF9RcZJAlmuj4SsOHsY9F+mxjEoDVZpP7duvbv9dIM
-yBlgw2UCgYB27Zwd3ta3x9mx2wRHaFMlcnwh+ERRGO6yAKndsr3L80Gkb2HxHlR3
-cA3dIg/YAGocjROOIO8MO5rclZm30qM5rlv0SH6gQ4nW16PZgHSuakgeX5fVHb4v
-nT8TKt0PY9r5e5cdHzpwlrDD1Q8GiAHvn0oH6oioGxlIV190YAHvGQ==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/integration/fixtures/server3.crt b/integration/fixtures/server3.crt
index 8197f6ac4e7..8321079a05d 100644
--- a/integration/fixtures/server3.crt
+++ b/integration/fixtures/server3.crt
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID/DCCAuSgAwIBAgIUMgfWSv3FrD0dRcHmPNxLr7p9BXcwDQYJKoZIhvcNAQEL
+MIID/DCCAuSgAwIBAgIUEnUzSUO0pzNCszbDRa04pSGwuxkwDQYJKoZIhvcNAQEL
 BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
 Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl
-Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDgyMTE5MDBaFw0yOTEwMDUyMTE5
+Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMTAzMDUxMjEwMDBaFw0zMTAzMDMxMjEw
 MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
 BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT
-ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALKKf9zhwcgu
-S53Vd92PLqHtDNpTbl4nM/5qYy7nHV5FHW7uolQHFA0BjJwxz7/LC39G950PpSIs
-K7Y99P7aMPVqVH5FGL+uoDbHMzt/gIUGgWj51J38+x6zN/9vIvAVIBClBhzEuB2k
-WJU6KyB1V5G+1wnnKRXLB9QC0f/7vqd9f21O7sJmWeVhGJuEUwwAp1p5WDGM2Tn8
-Fjy57O9f1nT4WVqWhB5EbvYGDF2Z5DWyKz90EWOwVw30ThcQHF57X6WJdlNiQOrY
-KIWO475QKPwbUSpRkvw1jwvllU8s4l6pB1hKTAcUK3UsWrzpf2+m8v8ou35uFD/c
-pd2bBx5MVlkCAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFAcMdmvX
-8NC4V4Z67Jb/pNUwai7cMB8GA1UdIwQYMBaAFGUHvq+NpnIUusRQaboNB/KOY3o+
+ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSPsK4MtuBP
+QCBfb9ekrUBEuAdhCFCB6nwipIC4/jCegxWixLQbEe6SU0PLGgkd2RRZiG1+2MwM
+V2nXIyxk/L5nzA/nsi06GZxcSRHkOMgopI4IP6EDidOA/5Y1cZmmT3BmHJcIiTtm
+AiugYPmxMquiyM1z4DfQMUO6gu/w3PaSGRqP8XSdFHdFfRGcJwCp7X7X0Vqw7gAD
+G62xz1rj9BYfD+8yS4+6U8RMzXaj+G1v44aZhk3WQve/hpE55fdIlckyOqKFEszR
+V4R2f9dBdre0f356r9r2nDl5Bun7rekvnG7dlRVH0InsACdfdd09lLFrlgReUK+8
+hrpruohJuScCAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBPTREy6
+XI6ikWBW5OUe8tb2OmzTMB8GA1UdIwQYMBaAFHJuOIffO5UVIaSl0zvhWS/61xEb
 MBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEA
-btQjJEWHD/0gYsNLFg3tDxZ64U/HfNlh4USGOK02VL2LteMcV8AoYlZ3jwmp4+33
-D3HlqLclJNABax2pOvTHVnQlf25TSNwJRtmzOvcg+6xYbPdgRoeEVsWbmgbpX7Vi
-P8FYelYCiYTPezjqZgPG1gmq0Uf/drlTrjwsG2njEcuK7hip+LdJnIrtpIrabpIk
-lZRa7Y/JBM3gP/rR1fu9lhzJ97s3NabuHzPwyouSTTknaaiGwSV8F5frh9NGcFhd
-G7giCLZLKklQB4IUTOFcVFSZmeAGy6KBqyT10N2kkBrsrcWhyMKIU9X0+6hh3Tlc
-JEla9as6qFvt1dFGp+qeww==
+Na9PT7bdbvlDuA3OVcat9klqGggbd2wH9vMUjEvkuIed2ItnVZbBnIx5B4igjVzE
+s3xPCdId07Fe0q6hZCNlXWywEtxCRrVTD4siIiv4ElXSnvT41bqwIHjPMqc3s80g
+WgrIG8sWIo4ziNSTCXdZ4Qn2PNH5VzOoD1u/5LFayNgklVfS33Wa+nowneB/XVVp
+cw5xmWvZXZa5mTwMLIFuJ4xb/EnF9a+gVO7S9cEXL7uW1pkLcFYeytvIYL39Fcl9
+T89rmrJdeWBOJ1/WqfIrKj4C/D4Txc47R2+sDsY4RCTdnGLPjwwkimlt/9ovOcrw
+c0vWPT+nhhPNHKcTcglTwQ==
 -----END CERTIFICATE-----
diff --git a/integration/fixtures/server3.key.insecure b/integration/fixtures/server3.key.insecure
index 46bf1bc70ca..e4456077a93 100644
--- a/integration/fixtures/server3.key.insecure
+++ b/integration/fixtures/server3.key.insecure
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go
index 7260e4d079c..c43c66f6d03 100644
--- a/pkg/transport/listener.go
+++ b/pkg/transport/listener.go
@@ -64,8 +64,16 @@ func wrapTLS(scheme string, tlsinfo *TLSInfo, l net.Listener) (net.Listener, err
 }
 
 type TLSInfo struct {
-	CertFile            string
-	KeyFile             string
+	// CertFile is the _server_ cert, it will also be used as a _client_ certificate if ClientCertFile is empty
+	CertFile string
+	// KeyFile is the key for the CertFile
+	KeyFile string
+	// ClientCertFile is a _client_ cert for initiating connections when ClientCertAuth is defined. If ClientCertAuth
+	// is true but this value is empty, the CertFile will be used instead.
+	ClientCertFile string
+	// ClientKeyFile is the key for the ClientCertFile
+	ClientKeyFile string
+
 	TrustedCAFile       string
 	ClientCertAuth      bool
 	CRLFile             string
@@ -107,7 +115,7 @@ type TLSInfo struct {
 }
 
 func (info TLSInfo) String() string {
-	return fmt.Sprintf("cert = %s, key = %s, trusted-ca = %s, client-cert-auth = %v, crl-file = %s", info.CertFile, info.KeyFile, info.TrustedCAFile, info.ClientCertAuth, info.CRLFile)
+	return fmt.Sprintf("cert = %s, key = %s, client-cert=%s, client-key=%s, trusted-ca = %s, client-cert-auth = %v, crl-file = %s", info.CertFile, info.KeyFile, info.ClientCertFile, info.ClientKeyFile, info.TrustedCAFile, info.ClientCertAuth, info.CRLFile)
 }
 
 func (info TLSInfo) Empty() bool {
@@ -134,6 +142,8 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, additionalUsages .
 	if errcert == nil && errkey == nil {
 		info.CertFile = certPath
 		info.KeyFile = keyPath
+		info.ClientCertFile = certPath
+		info.ClientKeyFile = keyPath
 		info.selfCert = true
 		return
 	}
@@ -263,6 +273,17 @@ func (info TLSInfo) baseConfig() (*tls.Config, error) {
 		return nil, err
 	}
 
+	// Perform prevalidation of client cert and key if either are provided. This makes sure we crash before accepting any connections.
+	if (info.ClientKeyFile == "") != (info.ClientCertFile == "") {
+		return nil, fmt.Errorf("ClientKeyFile and ClientCertFile must both be present or both absent: key: %v, cert: %v]", info.ClientKeyFile, info.ClientCertFile)
+	}
+	if info.ClientCertFile != "" {
+		_, err := tlsutil.NewCert(info.ClientCertFile, info.ClientKeyFile, info.parseFunc)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	cfg := &tls.Config{
 		MinVersion: tls.VersionTLS12,
 		ServerName: info.ServerName,
@@ -327,13 +348,17 @@ func (info TLSInfo) baseConfig() (*tls.Config, error) {
 		return cert, err
 	}
 	cfg.GetClientCertificate = func(unused *tls.CertificateRequestInfo) (cert *tls.Certificate, err error) {
-		cert, err = tlsutil.NewCert(info.CertFile, info.KeyFile, info.parseFunc)
+		certfile, keyfile := info.CertFile, info.KeyFile
+		if info.ClientCertFile != "" {
+			certfile, keyfile = info.ClientCertFile, info.ClientKeyFile
+		}
+		cert, err = tlsutil.NewCert(certfile, keyfile, info.parseFunc)
 		if os.IsNotExist(err) {
 			if info.Logger != nil {
 				info.Logger.Warn(
 					"failed to find client cert files",
-					zap.String("cert-file", info.CertFile),
-					zap.String("key-file", info.KeyFile),
+					zap.String("cert-file", certfile),
+					zap.String("key-file", keyfile),
 					zap.Error(err),
 				)
 			}
@@ -341,8 +366,8 @@ func (info TLSInfo) baseConfig() (*tls.Config, error) {
 			if info.Logger != nil {
 				info.Logger.Warn(
 					"failed to create client certificate",
-					zap.String("cert-file", info.CertFile),
-					zap.String("key-file", info.KeyFile),
+					zap.String("cert-file", certfile),
+					zap.String("key-file", keyfile),
 					zap.Error(err),
 				)
 			}
diff --git a/tests/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go
index 8688cfc83bb..d0bf6425548 100644
--- a/tests/e2e/etcd_config_test.go
+++ b/tests/e2e/etcd_config_test.go
@@ -155,6 +155,8 @@ func TestEtcdPeerCNAuth(t *testing.T) {
 			args = []string{
 				"--peer-cert-file", certPath,
 				"--peer-key-file", privateKeyPath,
+				"--peer-client-cert-file", certPath,
+				"--peer-client-key-file", privateKeyPath,
 				"--peer-trusted-ca-file", caPath,
 				"--peer-client-cert-auth",
 				"--peer-cert-allowed-cn", "example.com",
@@ -163,6 +165,8 @@ func TestEtcdPeerCNAuth(t *testing.T) {
 			args = []string{
 				"--peer-cert-file", certPath2,
 				"--peer-key-file", privateKeyPath2,
+				"--peer-client-cert-file", certPath2,
+				"--peer-client-key-file", privateKeyPath2,
 				"--peer-trusted-ca-file", caPath,
 				"--peer-client-cert-auth",
 				"--peer-cert-allowed-cn", "example2.com",