summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSara Golemon <sara.golemon@mongodb.com>2019-10-23 03:37:38 +0000
committerevergreen <evergreen@mongodb.com>2019-10-23 03:37:38 +0000
commit0fb7557a6bff0930f025b3036bcbb0c1ef0191db (patch)
tree8a772444770af61244a6ea668e5da52328555eab
parente06784e4e65a1e11b10adc3741f1136c2b002c8b (diff)
downloadmongo-0fb7557a6bff0930f025b3036bcbb0c1ef0191db.tar.gz
SERVER-43085 Regenerate trusted-{ca,client,server}.pem certificates
-rw-r--r--jstests/libs/trusted-ca.pem100
-rw-r--r--jstests/libs/trusted-client.pem103
-rw-r--r--jstests/libs/trusted-client.pfxbin2533 -> 3509 bytes
-rw-r--r--jstests/libs/trusted-server.pem103
-rw-r--r--jstests/libs/trusted-server.pfxbin2533 -> 3509 bytes
-rw-r--r--jstests/ssl/ssl_cert_selector.js16
6 files changed, 199 insertions, 123 deletions
diff --git a/jstests/libs/trusted-ca.pem b/jstests/libs/trusted-ca.pem
index 2a0e139e184..f11cada4f61 100644
--- a/jstests/libs/trusted-ca.pem
+++ b/jstests/libs/trusted-ca.pem
@@ -1,22 +1,78 @@
------BEGIN CERTIFICATE-----
-MIIDpjCCAo6gAwIBAgIDAghHMA0GCSqGSIb3DQEBBQUAMHwxHzAdBgNVBAMTFlRy
-dXN0ZWQgS2VybmVsIFRlc3QgQ0ExDzANBgNVBAsTBktlcm5lbDEQMA4GA1UEChMH
-TW9uZ29EQjEWMBQGA1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlv
-cmsxCzAJBgNVBAYTAlVTMB4XDTE2MDMzMTE0NTY1NVoXDTM2MDMzMTE0NTY1NVow
-fDEfMB0GA1UEAxMWVHJ1c3RlZCBLZXJuZWwgVGVzdCBDQTEPMA0GA1UECxMGS2Vy
-bmVsMRAwDgYDVQQKEwdNb25nb0RCMRYwFAYDVQQHEw1OZXcgWW9yayBDaXR5MREw
-DwYDVQQIEwhOZXcgWW9yazELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCePFHZTydC96SlSHSyu73vw//ddaE33kPllBB9DP2L7yRF
-6D/blFmno9fSM+Dfg64VfGV+0pCXPIZbpH29nzJu0DkvHzKiWK7P1zUj8rAHaX++
-d6k0yeTLFM9v+7YE9rHoANVn22aOyDvTgAyMmA0CLn+SmUy6WObwMIf9cZn97Znd
-lww7IeFNyK8sWtfsVN4yRBnjr7kKN2Qo0QmWeFa7jxVQptMJQrY8k1PcyVUOgOjQ
-ocJLbWLlm9k0/OMEQSwQHJ+d9weUbKjlZ9ExOrm4QuuA2tJhb38baTdAYw3Jui4f
-yD6iBAGD0Jkpc+3YaWv6CBmK8NEFkYJD/gn+lJ75AgMBAAGjMTAvMAwGA1UdEwQF
-MAMBAf8wHwYDVR0RBBgwFoIJbG9jYWxob3N0ggkxMjcuMC4wLjEwDQYJKoZIhvcN
-AQEFBQADggEBADYikjB6iwAUs6sglwkE4rOkeMkJdRCNwK/5LpFJTWrDjBvBQCdA
-Y5hlAVq8PfIYeh+wEuSvsEHXmx7W29X2+p4VuJ95/xBA6NLapwtzuiijRj2RBAOG
-1EGuyFQUPTL27DR3+tfayNykDclsVDNN8+l7nt56j8HojP74P5OMHtn+6HX5+mtF
-FfZMTy0mWguCsMOkZvjAskm6s4U5gEC8pYEoC0ZRbfUdyYsxZe/nrXIFguVlVPCB
-XnfB/0iG9t+VH5cUVj1LP9skXTW4kXfhQmljUuo+EVBNR6n2nfTnpoC65WeAgHV4
-V+s9mJsUv2x72KtKYypqEVT0gaJ1WIN9N1s=
------END CERTIFICATE-----
+# Autogenerated file, do not edit.
+# Generate using jstests/ssl/x509/mkcert.py --config jstests/ssl/x509/certs.yml trusted-ca.pem
+#
+# CA for alternate client/server certificate chain.
+-----BEGIN CERTIFICATE-----
+MIIDojCCAooCBG585gswDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MRAwDgYDVQQK
+DAdNb25nb0RCMQ8wDQYDVQQLDAZLZXJuZWwxHzAdBgNVBAMMFlRydXN0ZWQgS2Vy
+bmVsIFRlc3QgQ0EwHhcNMTkwOTI1MjMyNzQxWhcNMzkwOTI3MjMyNzQxWjB8MQsw
+CQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxFjAUBgNVBAcMDU5ldyBZb3Jr
+IENpdHkxEDAOBgNVBAoMB01vbmdvREIxDzANBgNVBAsMBktlcm5lbDEfMB0GA1UE
+AwwWVHJ1c3RlZCBLZXJuZWwgVGVzdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANlRxtpMeCGhkotkjHQqgqvO6O6hoRoAGGJlDaTVtqrjmC8nwySz
+1nAFndqUHttxS3A5j4enOabvffdOcV7+Z6vDQmREF6QZmQAk81pmazSc3wOnRiRs
+AhXjld7i+rhB50CW01oYzQB50rlBFu+ONKYj32nBjD+1YN4AZ2tuRlbxfx2uf8Bo
+Zowfr4n9nHVcWXBLFmaQLn+88WFO/wuwYUOn6Di1Bvtkvqum0or5QeAF0qkJxfhg
+3a4vBnomPdwEXCgAGLvHlB41CWG09EuAjrnE3HPPi5vII8pjY2dKKMomOEYmA+KJ
+AC1NlTWdN0TtsoaKnyhMMhLWs3eTyXL7kbkCAwEAAaMxMC8wDAYDVR0TBAUwAwEB
+/zAfBgNVHREEGDAWgglsb2NhbGhvc3SCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsF
+AAOCAQEAQk56MO9xAhtO077COCqIYe6pYv3uzOplqjXpJ7Cph7GXwQqdFWfKls7B
+cLfF/fhIUZIu5itStEkY+AIwht4mBr1F5+hZUp9KZOed30/ewoBXAUgobLipJV66
+FKg8NRtmJbiZrrC00BSO+pKfQThU8k0zZjBmNmpjxnbKZZSFWUKtbhHV1vujver6
+SXZC7R6692vLwRBMoZxhgy/FkYRdiN0U9wpluKd63eo/O02Nt6OEMyeiyl+Z3JWi
+8g5iHNrBYGBbGSnDOnqV6tjEY3eq600JDWiodpA1OQheLi78pkc/VQZwof9dyBCm
+6BoCskTjip/UB+vIhdPFT9sgUdgDTg==
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDZUcbaTHghoZKL
+ZIx0KoKrzujuoaEaABhiZQ2k1baq45gvJ8Mks9ZwBZ3alB7bcUtwOY+Hpzmm7333
+TnFe/merw0JkRBekGZkAJPNaZms0nN8Dp0YkbAIV45Xe4vq4QedAltNaGM0AedK5
+QRbvjjSmI99pwYw/tWDeAGdrbkZW8X8drn/AaGaMH6+J/Zx1XFlwSxZmkC5/vPFh
+Tv8LsGFDp+g4tQb7ZL6rptKK+UHgBdKpCcX4YN2uLwZ6Jj3cBFwoABi7x5QeNQlh
+tPRLgI65xNxzz4ubyCPKY2NnSijKJjhGJgPiiQAtTZU1nTdE7bKGip8oTDIS1rN3
+k8ly+5G5AgMBAAECggEAS7GjLKgT88reSzUTgubHquYf1fZwMak01RjTnsVdoboy
+aMJVwzPsjgo2yEptUQvuNcGmz54cg5vJaVlmPaspGveg6WGaRmswEo/MP4GK98Fo
+IFKkKM2CEHO74O14XLN/w8yFA02+IdtM3X/haEFE71VxXNmwawRXIBxN6Wp4j5Fb
+mPLKIspnWQ/Y/Fn799sCFAzX5mKkbCt1IEgKssgQQEm1UkvmCkcZE+mdO/ErYP8A
+COO0LpM+TK6WQY2LKiteeCCiosTZFb1GO7MkXrRP5uOBZKaW5kq1R0b6PcopJPCM
+OcYF0Zli6KB7oiQLdXgU2jCaxYOnuRb6RYh2l7NvAQKBgQD6CZ9TKOn/EUQtukyw
+pvYTyt1hoLXqYGcbRtLc1gcC+Z2BD28hd3eD/mEUv+g/8bq/OP4wYV9X+VRvR8xN
+MmfAG/sJeOCOClz1A1TyNeA+G0GZ25qWHyHQ2W4WlSG1CXQgxGzU6wo/t6wiVW5R
+O4jplFVEOXznf4vmVfBJK50R2QKBgQDegGxm23jF2N5sIYDZ14oxms8bbjPz8zH6
+tiIRYNGbSzI7J4KFGY2HiBwtf1yxS22HBL69Y1WrEzGm1vm4aZG/GUwBzI79QZAO
++YFIGaIrdlv12Zm6lpJMmAWlOs9XFirC17oQEwOQFweOdQSt7F/+HMZOigdikRBV
+pK+8Kfay4QKBgQDarDevHwUmkg8yftA7Xomv3aenjkoK5KzH6jTX9kbDj1L0YG8s
+sbLQuVRmNUAFTH+qZUnJPh+IbQIvIHfIu+CI3u+55QFeuCl8DqHoAr5PEr9Ys/qK
+eEe2w7HIBj0oe1AYqDEWNUkNWLEuhdCpMowW3CeGN1DJlX7gvyAang4MYQKBgHwM
+aWNnFQxo/oiWnTnWm2tQfgszA7AMdF7s0E2UBwhnghfMzU3bkzZuwhbznQATp3rR
+QG5iRU7dop7717ni0akTN3cBTu8PcHuIy3UhJXLJyDdnG/gVHnepgew+v340E58R
+muB/WUsqK8JWp0c4M8R+0mjTN47ShaLZ8EgdtTbBAoGBAKOcpuDfFEMI+YJgn8zX
+h0nFT60LX6Lx+zcSDY9+6J6a4n5NhC+weYCDFOGlsLka1SwHcg1xanfrLVjpH7Ok
+HDJGLrSh1FP2Rq/oFxZ/OKCjonHLa8IulqD/AA+sqYRbysKNsT3Pi0554F2xFEqQ
+z/C84nlT1R2uTCWIxvrnpU2h
+-----END PRIVATE KEY-----
+# Pre Oct 2019 trusted-ca.pem
+# Transitional pending BUILD update.
+-----BEGIN CERTIFICATE-----
+MIIDpjCCAo6gAwIBAgIDAghHMA0GCSqGSIb3DQEBBQUAMHwxHzAdBgNVBAMTFlRy
+dXN0ZWQgS2VybmVsIFRlc3QgQ0ExDzANBgNVBAsTBktlcm5lbDEQMA4GA1UEChMH
+TW9uZ29EQjEWMBQGA1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlv
+cmsxCzAJBgNVBAYTAlVTMB4XDTE2MDMzMTE0NTY1NVoXDTM2MDMzMTE0NTY1NVow
+fDEfMB0GA1UEAxMWVHJ1c3RlZCBLZXJuZWwgVGVzdCBDQTEPMA0GA1UECxMGS2Vy
+bmVsMRAwDgYDVQQKEwdNb25nb0RCMRYwFAYDVQQHEw1OZXcgWW9yayBDaXR5MREw
+DwYDVQQIEwhOZXcgWW9yazELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCePFHZTydC96SlSHSyu73vw//ddaE33kPllBB9DP2L7yRF
+6D/blFmno9fSM+Dfg64VfGV+0pCXPIZbpH29nzJu0DkvHzKiWK7P1zUj8rAHaX++
+d6k0yeTLFM9v+7YE9rHoANVn22aOyDvTgAyMmA0CLn+SmUy6WObwMIf9cZn97Znd
+lww7IeFNyK8sWtfsVN4yRBnjr7kKN2Qo0QmWeFa7jxVQptMJQrY8k1PcyVUOgOjQ
+ocJLbWLlm9k0/OMEQSwQHJ+d9weUbKjlZ9ExOrm4QuuA2tJhb38baTdAYw3Jui4f
+yD6iBAGD0Jkpc+3YaWv6CBmK8NEFkYJD/gn+lJ75AgMBAAGjMTAvMAwGA1UdEwQF
+MAMBAf8wHwYDVR0RBBgwFoIJbG9jYWxob3N0ggkxMjcuMC4wLjEwDQYJKoZIhvcN
+AQEFBQADggEBADYikjB6iwAUs6sglwkE4rOkeMkJdRCNwK/5LpFJTWrDjBvBQCdA
+Y5hlAVq8PfIYeh+wEuSvsEHXmx7W29X2+p4VuJ95/xBA6NLapwtzuiijRj2RBAOG
+1EGuyFQUPTL27DR3+tfayNykDclsVDNN8+l7nt56j8HojP74P5OMHtn+6HX5+mtF
+FfZMTy0mWguCsMOkZvjAskm6s4U5gEC8pYEoC0ZRbfUdyYsxZe/nrXIFguVlVPCB
+XnfB/0iG9t+VH5cUVj1LP9skXTW4kXfhQmljUuo+EVBNR6n2nfTnpoC65WeAgHV4
+V+s9mJsUv2x72KtKYypqEVT0gaJ1WIN9N1s=
+-----END CERTIFICATE-----
diff --git a/jstests/libs/trusted-client.pem b/jstests/libs/trusted-client.pem
index dec32375c1b..82a7f9e8204 100644
--- a/jstests/libs/trusted-client.pem
+++ b/jstests/libs/trusted-client.pem
@@ -1,49 +1,54 @@
------BEGIN CERTIFICATE-----
-MIIDnTCCAoWgAwIBAgIDA1clMA0GCSqGSIb3DQEBBQUAMHwxHzAdBgNVBAMTFlRy
-dXN0ZWQgS2VybmVsIFRlc3QgQ0ExDzANBgNVBAsTBktlcm5lbDEQMA4GA1UEChMH
-TW9uZ29EQjEWMBQGA1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlv
-cmsxCzAJBgNVBAYTAlVTMB4XDTE2MDMzMTE2MDY0OVoXDTM2MDMzMTE2MDY0OVow
-gYAxIzAhBgNVBAMTGlRydXN0ZWQgS2VybmVsIFRlc3QgQ2xpZW50MQ8wDQYDVQQL
-EwZLZXJuZWwxEDAOBgNVBAoTB01vbmdvREIxFjAUBgNVBAcTDU5ldyBZb3JrIENp
-dHkxETAPBgNVBAgTCE5ldyBZb3JrMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKI9cGBnH5wcthvFT1FdfQTw1EvOgtfBHVEMRFZH
-bupMnAqP69id0bf7SdBWzx4A1f1ws1RkeL5ot2u5T9NwsFzGvRBQ5onFtDnC3eKB
-OwapCk2B82mlx4xZBjewg+NbxoRJBUWGqB0LykaVUHxM6BGgwExNAyXQ9syPSyNZ
-NIr+zDrLdTfjKklmDkv9jSCB/T3t80kQPY+04u98buUe7wGM0WQFbVNoYrSkZ6Ja
-O+G8bpXP4hXIXsxOHucjBeJc1KR+lxEMw3wInZ2KjjMv7HsFIIOQg5pkMDXibSU6
-cNUZTA2MrzZ+t7TeAQyOTzfGlaatfvJYxU7v4u0W5jxeV60CAwEAAaMjMCEwHwYD
-VR0RBBgwFoIJbG9jYWxob3N0ggkxMjcuMC4wLjEwDQYJKoZIhvcNAQEFBQADggEB
-AHI6Rfq/UqAoPxiz5bqby2FnGOrskotgXhn1JkZLGCfllx5WgMuLnu1bvjoym567
-HySqAXQOqEWm6XRU7SVOA+69e4OLWX+HSKjFRuG5Ip67UpihZMgyLKuGRBwfnbXj
-14o+xbWjXCgVZEI7vzT7q/7/W1mXj680fHs93Zog561Id4Tf3DYkOoMawSfeF4iu
-8hcYjlJYjFb3ZvM1wokicmEwtY0+YbBGVo8xh5jYdfCLzYLxc3CpP5eXJtMvGE/x
-RnyiY3f7hkUZMibnREPS6kpQVEh36DT21C0OB8s7TcMU7yMKgVdqL1udmEkiKXTj
-H7v/s+7d54O0tr5+IysCAoA=
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAoj1wYGcfnBy2G8VPUV19BPDUS86C18EdUQxEVkdu6kycCo/r
-2J3Rt/tJ0FbPHgDV/XCzVGR4vmi3a7lP03CwXMa9EFDmicW0OcLd4oE7BqkKTYHz
-aaXHjFkGN7CD41vGhEkFRYaoHQvKRpVQfEzoEaDATE0DJdD2zI9LI1k0iv7MOst1
-N+MqSWYOS/2NIIH9Pe3zSRA9j7Ti73xu5R7vAYzRZAVtU2hitKRnolo74bxulc/i
-FchezE4e5yMF4lzUpH6XEQzDfAidnYqOMy/sewUgg5CDmmQwNeJtJTpw1RlMDYyv
-Nn63tN4BDI5PN8aVpq1+8ljFTu/i7RbmPF5XrQIDAQABAoIBAGg9iYKnP4wSdn+J
-WtkwdC9EfWLnoPH3RlrYwt+crgskhe3TYvmfDSxk7JxL6m+god1hGBfVJi9RIOi5
-/Cwib25s0vU0xasnuBCUv/PUjJRO8Cu0nyz2Myxd1rzZUSQ3x2kfcZ+mUUW4WZLY
-RQpYb5ND8coUgT0+8hOkzeY8XqIe5c4VrX16mA+uoIMsr4QHxe0pl59oY57V3Der
-+gsaGuWZ5hDvfuoCOx03Cuc1pTx0T8ZHdliu/xe+np3ETFdQ/1cyJMAJW3w15qKt
-L6AfkeRaMAgqxs2zU1rgPdJddRS7MaSJnpDtMjeyJpeNCMDJ/h3ihgSM1SM1QCtY
-tcnWdIECgYEA1/SVGV9McAvtVtQA1D7kPEo0ifCG8frUfGy2yK9aasFHhLS3JXXY
-4R0Fy/pOwdKNtnN3ZKd0Y0wcmlwPepg2HKlUFJdjqEKZctMzOscy3n08F4AV2rLc
-48q2XLLIQNN/JuqcaeRgQByvP6YL0YuqqsAPiRhTeYgJxp4c+JgbmDUCgYEAwFL7
-jzYwmud3HEgrfpXxDoWpemlKqCqe0cUix0OtR8XfCukZ5lbnC7Mu/FtqBitVdQYd
-2r1nRK66fTJejblNd1E4TG0sIwucI5B24I7XeG78r2kECnFT+vBE8BA6c/y8nTjz
-grWVMeR3n7WFxaTL/VW/kapW2YddWPq1Jh4q4JkCgYB2QBk8kXBbkkxd1Sy3C9ES
-KlfmiGx8KCseDrFv5oUOG9O7mPEIdCVT7v5zmRZzD4ZFt6hS11bl4JFw/KQFLz/C
-Jf5CYDtTsVQxCfDtaJI0PkMfYyWUYYiOuztsOwFobeccOi931HPX510W7yddkKrd
-YNmg6k8bJyCjP4UBotjJWQKBgElP2KDQ0VpbHWZkhF/unEMi5GXLOTA9fukLsqQu
-wiD35nvsO3k4az5kgWalGhdb8Wl4eWzmgjUGPgR3bN+tYUA4b7OCci6xwEU2Tnpv
-OOeptxzOdUHdzVt8t2qjZQTNtMBh80FCIqswIgF5WpLqrO/W/f1y50Roe0bt2pu7
-KDERAoGAbhEL6OCfX6Pf5hCggb4ymm9zmAndRKHAAJ2WQ2p6v+r1vm838n6y8r7Q
-Fqc3B7NIDDYzX4oyQZepOnHNF/UPEyVyGvJ8LBDruyiuAdGakVEvSHZ+ml4LnS06
-msP5hsHh9s4ptVcaF3/mNllBys+FwEWvLewgfVPJrDBNINFvYZ8=
------END RSA PRIVATE KEY-----
+# Autogenerated file, do not edit.
+# Generate using jstests/ssl/x509/mkcert.py --config jstests/ssl/x509/certs.yml trusted-client.pem
+#
+# Client certificate for trusted chain.
+-----BEGIN CERTIFICATE-----
+MIIDmTCCAoECBAuuqsUwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MRAwDgYDVQQK
+DAdNb25nb0RCMQ8wDQYDVQQLDAZLZXJuZWwxHzAdBgNVBAMMFlRydXN0ZWQgS2Vy
+bmVsIFRlc3QgQ0EwHhcNMTkwOTI1MjMyNzQyWhcNMzkwOTI3MjMyNzQyWjCBgDEL
+MAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9y
+ayBDaXR5MRAwDgYDVQQKDAdNb25nb0RCMQ8wDQYDVQQLDAZLZXJuZWwxIzAhBgNV
+BAMMGlRydXN0ZWQgS2VybmVsIFRlc3QgQ2xpZW50MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAshH7dr+x52giy0RU4rtNH+9dC7Fu+vHKRhP33U6+Z54E
+yj0IifG8zUNoKqZcx6480xeSg8De9GpfPsc6bFRvEk6sTMkf+nNaBajLHS69OzSc
+51GRnm9kNoI1L89iSsNlzDa3+FapsPJTkq3WMkE/bChntByNOYYXZTRc0KaRz2bN
+CnesRne2e9jS/AGTTWjJpw24dITclT5q+q67LqOKs140YMFVsmhLecvN61hreBsY
+F9xsQQkNHQvy9wYs5PV9lvI3ZogjlZU94ZkabMkeaypT6yFRNgksZpC9BunjrhZ7
+izVvxJMvtMzC9ua+K3ujI38N0b9m+v57cCDyz2IeVwIDAQABoyMwITAfBgNVHREE
+GDAWgglsb2NhbGhvc3SCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsFAAOCAQEAjoCk
+2AuQHoLUi37LXZRxafzBkYVKuMBiaipAw2ZCKk3dbebQp7ohKAF25sHhTztTUFyD
+jLAwOu76skmFYKxtwN13XmiBlrlMk/lMeTeiPHTXcYVpaZULimKPO4nh/l1SzQqx
+XTL9/yNrS5nlJXGpNSJL0kYZ4O5VJfMz9aTCGWrcGteVvKQgRNxsLb7ZT13+mme+
+INvjmR9zUX299wlJHYRDUxY1AmJTm6YTnXl6KQEZF64hI6KEUrh6LnsvJS0VbJay
+6BmKVV3W9DY8HzR+yawB0v+5Bz7TYAaymdzLIuELD/QFD6ksCqbsF8XdP4bF8IuU
+0ST7eG9taRXWQdmAog==
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCyEft2v7HnaCLL
+RFTiu00f710LsW768cpGE/fdTr5nngTKPQiJ8bzNQ2gqplzHrjzTF5KDwN70al8+
+xzpsVG8STqxMyR/6c1oFqMsdLr07NJznUZGeb2Q2gjUvz2JKw2XMNrf4Vqmw8lOS
+rdYyQT9sKGe0HI05hhdlNFzQppHPZs0Kd6xGd7Z72NL8AZNNaMmnDbh0hNyVPmr6
+rrsuo4qzXjRgwVWyaEt5y83rWGt4GxgX3GxBCQ0dC/L3Bizk9X2W8jdmiCOVlT3h
+mRpsyR5rKlPrIVE2CSxmkL0G6eOuFnuLNW/Eky+0zML25r4re6Mjfw3Rv2b6/ntw
+IPLPYh5XAgMBAAECggEAMO6iFEKfB4DlNsgjL17a1bC399OdNJYmyFUKYqUVy3Fv
+zYcyBn4ILLueL0Ih8rkde8BZgZ0JZ06nt5+VnVkiYHx/+mW2RONX1IBKuE00sMVH
+bIVMp6XietwS831gfDzvh0tuCG8AGGCuuHrOhmbJn9YGkUbbQ/hmC2h1LNzo6n3W
+sYCnBnhQJ6janc4OXJ7k0Sr5akJaw49A0kpB+xp4V00vwDoVZUBSYUQu7qbpuhxx
+Q9YkIZ6l9NSY4i3MPz1TX3gEM2Bq8CSvVZ/YbC1eVRmohxxDSXYlk8WhlwlvAQ9N
+sYJ1ur/3Xz7sDuO500sZRYrv+GM1R5s/NiyFBRItsQKBgQDktyqb0YyoIT2mHF78
+SU9z+EHT52CBfLk+jCRKYDvRGJFXKyYTBafz3+SLudY3o1aw2C+fHe4vZd4gYyGH
+uXI8vsym5gjOBTRl0oKHW9U6sMcQ4ZXf1eFE6j7XFK1wpHh50j3lV/szvB868B8N
+A5JG9cYsm3Tzw+9iWv8/7cOEvwKBgQDHUCPutVJyq54y/a0imUwTkUKqflVIsDzm
+BEDUuBwF8W8ScGqxWVOsQg9mM97Z5+1AkMCTMyDmOT1K7RGv1K27yzSYM3FT73uX
+DH+b+pEdnpyN1ytX0hy+rNjsJhQMpz6G/ewbvglR0+KMpim5NzGiykjUM1wnET1B
+zYivO95UaQKBgCnnIQhROQropCnV0tU3/TWLC0xufLDcj/fUpyV1QiBJ9v7Yae5c
+P+wfXfj3gDbLVyupP/hP/H50lGCsqMz7/eEBN+9v/7b3HyV0jvOLsKJDFwWRvuq2
+fcIphH/VSv1zNJtlGG/3UY+l7LbYnWe9+sPDbZ5okOHESQxlDZTB0+tzAoGBAJc4
+E3sZ8Sr1UHrJguGcQ18ZN+ZZIWWb6ShvE60Q3poXurjXt+tEpbotCLf3JN5ZG+V/
+rcxA33Ys+XbudRvdlc7Eduv/I72WFkPdBLiYHB/H5mmrVcQ0swBr7c0FevK6tTMA
+VnIZ9cIyq1EhBMj0umETbrwpF4LAjqRtR4YEO0P5AoGAWavKrREBUVtSqEo9+XiU
+7Hw75KCThDTTxByurkGwZbzjNAuxoDOWPDueAfqG5rv4ld1c6SjDyI7eCDzjoriK
+s1Nmxog8Wu+2Vpe7Q6KDsPpLYY4Bfz6ikWHuVFAeryfPWizMIWofJx5dNIDpnKPb
+PUTe4hDUB68LIOTJVfirP78=
+-----END PRIVATE KEY-----
diff --git a/jstests/libs/trusted-client.pfx b/jstests/libs/trusted-client.pfx
index 21693928927..cecf97cee3e 100644
--- a/jstests/libs/trusted-client.pfx
+++ b/jstests/libs/trusted-client.pfx
Binary files differ
diff --git a/jstests/libs/trusted-server.pem b/jstests/libs/trusted-server.pem
index caaee422a44..92a8e3ca633 100644
--- a/jstests/libs/trusted-server.pem
+++ b/jstests/libs/trusted-server.pem
@@ -1,49 +1,54 @@
------BEGIN CERTIFICATE-----
-MIIDnTCCAoWgAwIBAgIDCWhIMA0GCSqGSIb3DQEBBQUAMHwxHzAdBgNVBAMTFlRy
-dXN0ZWQgS2VybmVsIFRlc3QgQ0ExDzANBgNVBAsTBktlcm5lbDEQMA4GA1UEChMH
-TW9uZ29EQjEWMBQGA1UEBxMNTmV3IFlvcmsgQ2l0eTERMA8GA1UECBMITmV3IFlv
-cmsxCzAJBgNVBAYTAlVTMB4XDTE2MDMzMTE2MDUyM1oXDTM2MDMzMTE2MDUyM1ow
-gYAxIzAhBgNVBAMTGlRydXN0ZWQgS2VybmVsIFRlc3QgU2VydmVyMQ8wDQYDVQQL
-EwZLZXJuZWwxEDAOBgNVBAoTB01vbmdvREIxFjAUBgNVBAcTDU5ldyBZb3JrIENp
-dHkxETAPBgNVBAgTCE5ldyBZb3JrMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJwOsMO+MhWmHcSOdjFrZYjPMOt8uIqJ1pR/JI/E
-hTdUq7fXPHZNhUTzwX1JZB+QkXhnJiAf2ZQOnl7R49vudoPdOZo6bJQP8/Hy5F79
-B8Nw9xrcPuzGBRK3IpY7j9gnAOC5jvN2zh+nHoqNhPmarpKgbDeLosABiDFSHiCE
-degHziJ0Tj0AJ6GRbeHeTvv5K4lLwMzyYnpkG0cMpLvLIUwJa22Vp8PujMcmjX9W
-ASmSXJmcszYKjaRc7HB6ronIEZWy//PSXlvuk8xYaM40HkGy2gN6wV+2Z45QdDds
-NxUuu56TzJ7z7as/vYXXsIc/TSmvM02S01JWUjWeVGc1sb8CAwEAAaMjMCEwHwYD
-VR0RBBgwFoIJbG9jYWxob3N0ggkxMjcuMC4wLjEwDQYJKoZIhvcNAQEFBQADggEB
-AAKLZiQxz3NYvc04GDMRIUDfR50RMw4SuXXgGYTpPUP/akOes11+u5iKhgyKQ+ca
-TttX8mwwvNjQFN8hjBodsrWK9avMUenJBk+Y2ztzLSpKAmC7NUUM6sFB1D3yocsG
-aH5EuyH/dcAdb9z5vYurriRfd1ldmyGAqvA6lKGp1zxTAi0WWbYIZia0LyVoH98p
-x0s+amrSMvkVqIK+qV+CVqW2dNLe+kREjGxzGidCSfHZrHncuTX8/10xHUbAQW0z
-EWF6epmm+jniwgh2Zs/xe7+eY1Nzfq0ly06MVKCs1/lZ0vhAHGZ7V6yBX5zig02x
-VAHb45KqzmYGwKErO7ZFY2I=
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAnA6ww74yFaYdxI52MWtliM8w63y4ionWlH8kj8SFN1Srt9c8
-dk2FRPPBfUlkH5CReGcmIB/ZlA6eXtHj2+52g905mjpslA/z8fLkXv0Hw3D3Gtw+
-7MYFErciljuP2CcA4LmO83bOH6ceio2E+ZqukqBsN4uiwAGIMVIeIIR16AfOInRO
-PQAnoZFt4d5O+/kriUvAzPJiemQbRwyku8shTAlrbZWnw+6MxyaNf1YBKZJcmZyz
-NgqNpFzscHquicgRlbL/89JeW+6TzFhozjQeQbLaA3rBX7ZnjlB0N2w3FS67npPM
-nvPtqz+9hdewhz9NKa8zTZLTUlZSNZ5UZzWxvwIDAQABAoIBAQCQFHQY1NHy8OKM
-5aaz697bV8dns0fCCI7HnTdJUPxZYGAGJL8azmmbhp1+qbK5/cSA8GLfx+ge7PxE
-uO3x0RE0n5weC5DRhoUIPeOg22Y+iF5sOyoReqWWaOSS5bzhqOkDke4sU+TsjmQB
-MbWyqaBBmcEv60jAkumF97X++azOIm1EqTXfSu1K7gqtiL9H9T8vIYOOuTAduOsD
-el/v5QQbWb3e/NLhcmzHL6rPcR/9jCn1rJ9HAhAqm6eKZS2cAgTGLLtCUhumVliO
-bEIm2fcQ5h+BDZc5EF/SURKvUaFx/xTIQ5s1oEKN8iN+kIYzgbZ/Ds/GOo7nWVmy
-1KZswK05AoGBANBvT/vSpI7vokmph+GifjToHeinceg3pssf8mHw8xv3H0mZxBkt
-CJq6rFwKwMH8K9tQfBqp4hfVgfdAWZyKqqo1Mtecohzb9D0GLYZ6Of18pAZK/aEt
-L8ADuGYbLAFAS10z4djBSqlud82d194zSgfLP3FYRsj5Ni8w9bPuMOKVAoGBAL+r
-gd1/B+kkbO/NAprjXAFT91Wjf+YMQgM8vOMXlq7LlGeGQSb0zVZpdDtZ3ohqdu1i
-38y0G/CvBLddm8VkC3/fhfO8xW8PjdRBbF87j1k4HerAxcLOO91z+MHFMbUryOJc
-U0aAzJB3B4E491xaXTL8jZLYxmgJtc4jBcLKzmIDAoGBAKXf39w9Hx5tUE6k7vE+
-uodqLdsn3nt6Rm+iRedxtFcODEUrbKbIcu+IHYDGQe5eu5w2af1iMv7auCpHeMke
-hYEdAxAZo92poa4qy3IYtSuo1HP5m+x3pGd/znDbsOJyA0fx8QrpkHxT4F2u/srj
-MEgRlLSkFvj7cwaNRQvjQ94dAoGAA2+4wVbgtm5fwaDkVhCTeradrZxj06UOne49
-2Lh4jCO8QmrmyiMDd3QmkFXZJor6HOFz78Ce657Hr93uyAg2KJHCXg9ZXtdhjJer
-sL1poYjfCHFyWj7GVf8ZS6gUbxIc5OoQ2CfBAyoPKWLzFGXOW/apNyPJ0t2xs8Nu
-/AIU1y8CgYEAyUhyJe8XaDOjoR9D1freHY6Vt9NkofDpYfWL4+y/kGD45yCDBXj0
-LYAD89/Qog1MbPN8FGrgMu2b3dI0i+iZlWduvQRn71QepT6wiB84ivxjECSpZGoH
-2F0SM1MVAK/f4Dm9H9Kaukq2BpsN8Uhvzg2EUFg1mLJ+OBArgT524Ys=
------END RSA PRIVATE KEY-----
+# Autogenerated file, do not edit.
+# Generate using jstests/ssl/x509/mkcert.py --config jstests/ssl/x509/certs.yml trusted-server.pem
+#
+# Server certificate for trusted chain.
+-----BEGIN CERTIFICATE-----
+MIIDmTCCAoECBHL7ykYwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MRAwDgYDVQQK
+DAdNb25nb0RCMQ8wDQYDVQQLDAZLZXJuZWwxHzAdBgNVBAMMFlRydXN0ZWQgS2Vy
+bmVsIFRlc3QgQ0EwHhcNMTkwOTI1MjMyNzQyWhcNMzkwOTI3MjMyNzQyWjCBgDEL
+MAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9y
+ayBDaXR5MRAwDgYDVQQKDAdNb25nb0RCMQ8wDQYDVQQLDAZLZXJuZWwxIzAhBgNV
+BAMMGlRydXN0ZWQgS2VybmVsIFRlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAvgLzw1ZsakCT8sOZDCQcaPZaIN6YEL6nQehjeAHDBCHQ
+MvaGkAxgk8GW+9iRzMBCMsNxDju7WiLFCQSv1qeeXbpSGl0TXPI4wUPvs83A9nSq
+0hBuw9XY85e1oXcNWQaP01EO0rR8S9bAovyW4EDvJomAopvrkFoI/eSfcANlh7rk
+6DvpZE2Ml5yGDPGLDfv5tuYMPckOV2cHo0puZqRn9Dr8M5czDSflUeH1LMYQsGwB
+zKn/tQ9a476kqwpyf6lrj5/aTpK3vIA0tGrOj5eXs1HvUUSHpstf8OdWJRciEf9I
+L5CNLRUhP7nvczTwbVRR6CQjMPFt1LO/tRLCOINH7wIDAQABoyMwITAfBgNVHREE
+GDAWgglsb2NhbGhvc3SCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsFAAOCAQEAKT2i
+1FXjd/I9pPcr5mCuePbqtNwTUfiFJvcTSPopKYz2IdEnStJHPezFQ37Z95fFAg5o
+ChZplq1jBoWDOX2XY02nIKdj7Yc157+qnqocrvQbJlUI9MWfwWoq/CqkvMG2uSmQ
+FRuHsHZi4vEK254IhB7kYgOfBMjhsX1+sE96SA0DcLAHyYoMckLgfTnLikS9ir0N
+zijVD5NE8mjV6dIOZeh/q54QdS3Ea33DMHegDDMoe2x/Eh/0Y4XU2k/Z48JGe2/d
+afsQTWQPr2qJcusi2MHTRGUsaP+UEFl3l9nM8IjaJ4dsw6umd631DNay5yNR5LsY
+7qpA1wjwbBvRR0wTpg==
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+AvPDVmxqQJPy
+w5kMJBxo9log3pgQvqdB6GN4AcMEIdAy9oaQDGCTwZb72JHMwEIyw3EOO7taIsUJ
+BK/Wp55dulIaXRNc8jjBQ++zzcD2dKrSEG7D1djzl7Whdw1ZBo/TUQ7StHxL1sCi
+/JbgQO8miYCim+uQWgj95J9wA2WHuuToO+lkTYyXnIYM8YsN+/m25gw9yQ5XZwej
+Sm5mpGf0OvwzlzMNJ+VR4fUsxhCwbAHMqf+1D1rjvqSrCnJ/qWuPn9pOkre8gDS0
+as6Pl5ezUe9RRIemy1/w51YlFyIR/0gvkI0tFSE/ue9zNPBtVFHoJCMw8W3Us7+1
+EsI4g0fvAgMBAAECggEBAJ2UdzKFpu3LVqdbPb8K56DIxeBCmlwwsSeAoZVx6Jix
+rifFub0W9rUzNJLyfaAPxhaxbT4/nVXYRg3/nBBp/HWAwvxoOlm37Aej3tQADEqY
+YN5LkIDLBdym8ZPR1vkA7yByNdfapMaEeEfzMPEUCQGtwUeaBZc2hASDqRJNTtNr
+ZUiXGaJvbpgqLAhN1N40TJstUwYAq6nR/hljSZ22EmI13oSgddi9NE49v4R0JL8P
+EsxsE9uLynz1TVS5thshX3BrN+Iz8zcJqilclOkagQycL+WZrjpfLn4HBLdCPr3b
+3+TtQHq/BIq+Qdl6yCk6Vf1C5xpu0U6PAIGJVOjrXJkCgYEA8vdb+l1iQlsd4XNX
+ipPKqyewok3HRpvZfQDAVxBOydGnr5xSt5/vT5lcM8oIpCsx/vF0tr1qGWFq4qCY
+J+j0U/TdjcsVsicg6xDQsIwviU3vXm2KqSTu41T/wSvKzuv0X9MlzP7aY5U/NR/X
+VY6e5pK2TIqC5CVEgeqgDZl0SnMCgYEAyDReeFuM4U5Y4FJ4S59azdC427uMCb9X
+acVFIom1kTWKt/cb9qIWVSXIcnxGbls9zHwnWLEIcj3A4q/B6+lGDF8yRDxnaOfs
+JJuiOg8STZAfoy4SmWxydmU2g/IGoQtOFt6lhFt3xfiUNPIQzHQRsIlpFsWt23Xw
++NdqclRwgZUCgYEA6ggYQb4nwpDv5FTs0t/vDRQLERtoQvwl70GFA5gCvGXFZuNl
+zdgxdHPdm0kVL8UnwFGmQcuL4myyvx8/0NmUVzZ7HnSrLlKAY8xrqFMwCsrWMhfD
+w49+x9z9CX38OXqQhqjlNWOayudc3fgQvCnHp4NUM8ALumSna5irmM3idT8CgYBc
+3F2NOfmob6ytr9L4UJvPpyZ3VRBpXQTwnH2qvXEoP0tudQHVbe0p5XKKF7abbVrG
+xDeD3elrA9W5z4gFIphJGMa5+8KDWD+h40Zl46O7skPabn5WB4U4AU49+T616AZ6
+eR8Qu1Rc0SX9QOIl0xh5Z+MEmwA/MP9qjJBlI2Fj2QKBgBRs5DyiQfSRC0vNlSg7
+HYBeaxx2gu0LbNg7dFizdCjhRoFhqfRI+uUZAtHnjs0iw3zedb+7YGukNR+5a3AS
+IWmjFU7wsi7ydnrWlALuNFt4oDE+JnH3AHWZ5vrlevJyVRwsE2YVRSoG1M6CT3Y/
+/5yVKapUys2TiPtZb+V/6wjD
+-----END PRIVATE KEY-----
diff --git a/jstests/libs/trusted-server.pfx b/jstests/libs/trusted-server.pfx
index f68d75f88b9..a434f9da414 100644
--- a/jstests/libs/trusted-server.pfx
+++ b/jstests/libs/trusted-server.pfx
Binary files differ
diff --git a/jstests/ssl/ssl_cert_selector.js b/jstests/ssl/ssl_cert_selector.js
index b62c9cb2890..eb4c10b16fb 100644
--- a/jstests/ssl/ssl_cert_selector.js
+++ b/jstests/ssl/ssl_cert_selector.js
@@ -14,8 +14,12 @@ requireSSLProvider('windows', function() {
// Import a pfx file since it contains both a cert and private key and is easy to import
// via command line.
- runProgram(
- "certutil.exe", "-importpfx", "-f", "-p", "foo", "jstests\\libs\\trusted-client.pfx");
+ runProgram("certutil.exe",
+ "-importpfx",
+ "-f",
+ "-p",
+ "qwerty",
+ "jstests\\libs\\trusted-client.pfx");
}
const conn = MongoRunner.runMongod(
@@ -39,7 +43,13 @@ requireSSLProvider('windows', function() {
};
assert.doesNotThrow(function() {
- testWithCert("thumbprint=9ca511552f14d3fc2009d425873599bf77832238");
+ try {
+ // trusted-client.pfx
+ testWithCert("thumbprint=6AE38B35F4551B6BDCDB89AFABE0B277046F2735");
+ } catch (e) {
+ // Transitional: Pre Oct-2019 trusted-client.pfx
+ testWithCert("thumbprint=9ca511552f14d3fc2009d425873599bf77832238");
+ }
});
assert.doesNotThrow(function() {