1 files changed, 45 insertions, 40 deletions
diff --git a/jstests/libs/rollover_ca_merged.pem b/jstests/libs/rollover_ca_merged.pem
index 25551e0b58c..d89b03d088c 100644
--- a/jstests/libs/rollover_ca_merged.pem
+++ b/jstests/libs/rollover_ca_merged.pem
@@ -1,46 +1,51 @@
+# Autogenerated file, do not edit.
+# Generate using jstests/ssl/x509/mkcert.py --config jstests/ssl/x509/certs.yml rollover_ca_merged.pem
+#
+# Combination of rollover_ca.pem and ca.pem
+
 # Certificate from rollover_ca.pem
 -----BEGIN CERTIFICATE-----
-MIIDwjCCAqoCBCfZqc4wDQYJKoZIhvcNAQELBQAwfjELMAkGA1UEBhMCVVMxETAP
-BgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhOZXcgWW9yazEWMBQGA1UECgwNTW9u
-Z29EQiwgSW5jLjEPMA0GA1UECwwGS2VybmVsMSAwHgYDVQQDDBdLZXJuZWwgUm9s
-bG92ZXIgVGVzdCBDQTAeFw0xOTA5MjUyMzQyMjJaFw0zOTA5MjcyMzQyMjJaMH4x
-CzAJBgNVBAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazERMA8GA1UEBwwITmV3IFlv
-cmsxFjAUBgNVBAoMDU1vbmdvREIsIEluYy4xDzANBgNVBAsMBktlcm5lbDEgMB4G
-A1UEAwwXS2VybmVsIFJvbGxvdmVyIFRlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCZ1TfUuIBLpWEQilCQAl7V1qhb9PVzlF/tFHBLa95zjJBM
-VbJyN0hqyT/OP8DKrssKLbizUwYNp8Pq5IDzI6L2Tq64SkvSlVWS/ix8f9l3AKRW
-5thtzAdJEw2NsRqC/2dDUqvRvdGEnEUcgbuuYH3tQL5DvYQof8ra//vc1BJSj9r4
-FeFxck1RkJdx122ZUMmpTRpI2a1qZlCo/JzUiM5Lcd66q4juNiD/jMQBb/+Fgh5f
-aI5bJXgNhWKI2WP7UvkReBCN8KF7OYe9DeZN8A0+REWeXw4y9A18ErWXumtlQau9
-RPtqzpKz+f/HKUeOSNJvpBR5Mssw56BRRX2IeyppAgMBAAGjTTBLMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBT2TUaI0V2Zodt/68sv
-D39RaaMiizAJBgNVHSMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAr1eZ7DuWIe8UW
-/mS8Yh/8eQUrj/TjOP880LlpT16vA1TGXXxq9+bWaWgOHua9eMVDCweTgLLkhbJe
-MFWItpe4eALzU8y13MX09xcQRzFAoFoTzebH8+YuqMCtuzlziIA4UFC75ZV0PNtZ
-OHQls2RRpyACY3GLdJxewN4KiyU34C5HoQcch2XrY+8ttjHKJCZBmOHLifPEFnMR
-GBqUyV6uBsIT5lzZhWbyguH5m0Ljy98FeQ5NgAwXCJb5NSeE++6dzEVMCljdJ1T8
-g3TEBeJbY7Y+26Z9ZncjcgrWY6aXiIAAqTKhKvfA2o8hLA1dWmeLr4M4a5IkU9aH
-ce6K2j6q
+MIIDxzCCAq+gAwIBAgIEMEXJYDANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV
+UzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRYwFAYDVQQK
+DA1Nb25nb0RCLCBJbmMuMQ8wDQYDVQQLDAZLZXJuZWwxIDAeBgNVBAMMF0tlcm5l
+bCBSb2xsb3ZlciBUZXN0IENBMB4XDTIyMDEyNzIxNTk0N1oXDTI0MDQzMDIxNTk0
+N1owfjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMREwDwYDVQQHDAhO
+ZXcgWW9yazEWMBQGA1UECgwNTW9uZ29EQiwgSW5jLjEPMA0GA1UECwwGS2VybmVs
+MSAwHgYDVQQDDBdLZXJuZWwgUm9sbG92ZXIgVGVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALvUQ/c9NMdWMIPv0B5lP0oKUiwAL2WvTZyzmRX9
+imZm2fYpjbYJD6jrpvYk3BP1wV7iPaVqMyy5VmsBjcdJoZQ8kbUE+LnqFSpPwZvs
+qlBfVPSPKwf4ZQYESmfrtpn1xOhOW3q8OsJHpdmFQFVOzPm87kSslVuwkyUhwLtd
+ToSwe339K4OUJV1ZVrtTQ8bMT/gEV2Gh+fScUpK47W01+he8p3lr0WDwmioyCAYS
+v1FHd6YSHB17/M1n5xsDWFillDTxMYK2Y/He7Tvfmy/d5+wOoUNWzQDIkdKlndQ2
+oy5YF0XENmPdGBY6mWaPd03/zKkhVfU0tY650OvLEhIdqmMCAwEAAaNNMEswDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFKMXkxW7L94J
+wfc3SWBZrL6W5EzOMAkGA1UdIwQCMAAwDQYJKoZIhvcNAQELBQADggEBAA9eK1CR
+Xijo6jowUggkJgwietTVAJfoKBJS+OKpBEbd6lQMg1BpbK3AZe/mY0L5c/MdwDut
+7UL9TWtbPiMesPZ5PEO54fvddRIm+gUYRXyiuY2p7vVOt0a4136pMCn24YoFgzQS
+vEP8sDHnL/kBVNB9Khwt1Jt8PaTlkuB2B9TqJNcJUwtaAFN8UekaC9MEk0KbRdhy
+d37h1rvR+FO/BtaWvF8UxGCKK6TkvPHq3hk1gJ6wL7ME+U1op7EzKnKD4yro4oq1
+54KqKP3wjcfuZSLPlgIfJjkKrQmG3gZ6f6aNaMN/IoVdUubjRKEfDEkhEEUZnwt3
+Xb6r5w91Rbljk24=
 -----END CERTIFICATE-----
 # Certificate from ca.pem
 -----BEGIN CERTIFICATE-----
-MIIDdDCCAlwCBBmRIxIwDQYJKoZIhvcNAQELBQAwdDELMAkGA1UEBhMCVVMxETAP
-BgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MRAwDgYDVQQK
-DAdNb25nb0RCMQ8wDQYDVQQLDAZLZXJuZWwxFzAVBgNVBAMMDktlcm5lbCBUZXN0
-IENBMB4XDTE5MDkyNTIzMjczOVoXDTM5MDkyNzIzMjczOVowdDELMAkGA1UEBhMC
-VVMxETAPBgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQHDA1OZXcgWW9yayBDaXR5MRAw
-DgYDVQQKDAdNb25nb0RCMQ8wDQYDVQQLDAZLZXJuZWwxFzAVBgNVBAMMDktlcm5l
-bCBUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAupVkx8+n
-AqzsANKwNPeCYlf2q0WgF4kSUMNJdpmMelrr7hh7EOnAU0hTAQx9BKTEbExeCzH6
-OArFNGjewjWVXwaOpCjK8FMvK6/lGVEpmoHNF9XuiQVmaQ4bJD6rC73YjpgNIPeL
-5PyoFLEZv+X2cRBPpTcSRcf87tk8HL7v0eyk1JBhkeKK68SYdWwZlHaa1jqwmliW
-WvVMkHVH3lx0VOgQwWtOgs0K1zpcZ0sH5MGpYRQOiidIRZj3PkKeTPQe2D6VQQtv
-2yDs9dWfCxJJP9QiWclL2rF/xqlFSNEIfNZpZhk6I1DHQpA2uyJfzRH62pFasJuB
-CVh5Tr0EDoVreQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQARdNCYYWxi2fyhJwzGHwIT261d/pTlOSYLlm84c72aEneFUnfp8/H5
-JjuFbnhiX+5+h3M7eDQhra9s+H3vKr7o38EIVf5OKXvpNLwv1UUmomBvKqccioYh
-bxrfwCzfBRuUmW05kcAVn8iKovqyxL7npEZbckwtT+BqZ4kOL4Uzre+S1HMx0zOu
-xulSYA/sBoJ2BB93ZIAqB+f/+InS9yggzyhhaQqS7QEl1L4nZE4Oy0jKcxdCzysm
-TqiyH+OI5SVRTfXh4XvHmdWBBaQyaTmQzXYUxUi7jg1jEAiebCGrEJv9plwq4KfC
-cze9NLBjaXR3GzonT8kICyVT/0UvhuJg
+MIIDeTCCAmGgAwIBAgIEe9SskzANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJV
+UzERMA8GA1UECAwITmV3IFlvcmsxFjAUBgNVBAcMDU5ldyBZb3JrIENpdHkxEDAO
+BgNVBAoMB01vbmdvREIxDzANBgNVBAsMBktlcm5lbDEXMBUGA1UEAwwOS2VybmVs
+IFRlc3QgQ0EwHhcNMjIwMTI3MjE1OTQyWhcNMjQwNDMwMjE1OTQyWjB0MQswCQYD
+VQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxFjAUBgNVBAcMDU5ldyBZb3JrIENp
+dHkxEDAOBgNVBAoMB01vbmdvREIxDzANBgNVBAsMBktlcm5lbDEXMBUGA1UEAwwO
+S2VybmVsIFRlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDf
+vZIt82obTHnc3iHgUYSc+yVkCHyERF3kdcTTFszDbN9mVPL5ZkH9lIAC3A2rj24T
+pItMW1N+zOaLHU5tJB9VnCnKSFz5CHd/KEcLA3Ql2K70z7n1FvINnBmqAQdgPcPu
+Et2rFgGg3atR3T3bV7ZRlla0CcoAFl/YoDI16oHRXboxAtoAzaIwvS6HUrOYQPYq
+BLGt00Wws4bpILk3b04lDLEHmzDe6N3/v3FgBurPzR2tL97/sJGePE94I833hYG4
+vBdU0Kdt9FbTDEFOgrfRCisHyZY6Vw6rIiWBSLUBCjtm2vipgoD0H3DvyZLbMQRr
+qmctCX4KQtOZ8dV3JQkNAgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAJnz4lK9GiCWhCXIPzghYRRheYWL8nhkZ+3+oC1B3/mGEf71
+2VOdND6fMPdHinD8jONH75mOpa7TanriVYX3KbrQ4WABFNJMX9uz09F+0A2D5tyc
+iDkldnei+fiX4eSx80oCPgvaxdJWauiTsEi+fo2Do47PYkch9+BDXT9F/m3S3RRW
+cia7URBAV8Itq6jj2BHcpS/dEqZcmN9kGWujVagcCorc0wBKSmkO/PZIjISid+TO
+Db2g+AvqSBDU0lbdP7NXRSIxvZejDz4qMjcpSbhW9OS2BCYZcq5wgH2lwYkdPtmX
+JkhxWKwsW11WJWDcmaXcffO3a6lDizxyjnTedoU=
 -----END CERTIFICATE-----