Skip to content

Commit a0641ab

Browse files
authored
CPP-965 Use more reliable invalid cert with mulit-cert PEM rather than new dummy one (#542)
1 parent 8438965 commit a0641ab

File tree

1 file changed

+1
-40
lines changed

1 file changed

+1
-40
lines changed

tests/src/integration/ssl_certificates.hpp

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -140,22 +140,6 @@ namespace test {
140140
* ssh-keygen -p \
141141
* -N invalid \
142142
* -f ssl/invalid/driver-private-invalid.pem
143-
*
144-
* # Building dummy PEM. Some tests below require multiple PEM-encoded
145-
* # certs in order to verify that we consider all input certs (and
146-
* # not just the first one)
147-
* keytool -genkeypair -noprompt -keyalg RSA -validity 36500 \
148-
* -alias dummy \
149-
* -keystore ssl/keystore.jks \
150-
* -storepass cassandra \
151-
* -keypass cassandra \
152-
* -dname "CN=1.2.3.4, OU=SomeOU, O=SomeO, L=Somewhere, ST=SomeState, C=US"
153-
*
154-
* keytool -exportcert -rfc -noprompt \
155-
* -alias dummy \
156-
* -keystore ssl/keystore.jks \
157-
* -storepass cassandra \
158-
* -file ssl/dummy.pem
159143
*/
160144

161145
static const unsigned char cassandra_crt[953] = {
@@ -573,31 +557,8 @@ class SslCertificates {
573557
"cAHazCFHOKxSQ/G7n+8xDx3r6jHxyE956u5jf5FRqUbaVIBMdg==\12"
574558
"-----END CERTIFICATE-----\12";
575559
}
576-
static const char* dummy_pem() {
577-
return "-----BEGIN CERTIFICATE-----\12"
578-
"MIIDcTCCAlmgAwIBAgIEKDL8hDANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQGEwJV\12"
579-
"UzESMBAGA1UECBMJU29tZVN0YXRlMRIwEAYDVQQHEwlTb21ld2hlcmUxDjAMBgNV\12"
580-
"BAoTBVNvbWVPMQ8wDQYDVQQLEwZTb21lT1UxEDAOBgNVBAMTBzEuMi4zLjQwIBcN\12"
581-
"MjIwMzI1MjAzNzM3WhgPMjEyMjAzMDEyMDM3MzdaMGgxCzAJBgNVBAYTAlVTMRIw\12"
582-
"EAYDVQQIEwlTb21lU3RhdGUxEjAQBgNVBAcTCVNvbWV3aGVyZTEOMAwGA1UEChMF\12"
583-
"U29tZU8xDzANBgNVBAsTBlNvbWVPVTEQMA4GA1UEAxMHMS4yLjMuNDCCASIwDQYJ\12"
584-
"KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIEmKUqWeRb9WGFLjE4OVOC99643Xz2s\12"
585-
"BahaHpoEvUW7r0gO6BxQ6b6KkiZbs5OfqX4MYheEUePQq3v2OJ1nAUTSiXDwCOUq\12"
586-
"3ZhS9CS4NlNaIqF4MIoPxaQYqG3jhUB/fNkg9o4DgrH0DmnGd6Mgw2/hUvNGq8IW\12"
587-
"JdlMgZGnX2cIhGQ0Cu/HV372IoYNotGEncyJEg/0ZiJDUyTWV91WoRY767GqIxn/\12"
588-
"lROrsiTzF/xzqcBdOCaMWP3et3X+jrk/i2957mw7bYYRuD415/pHlQqQQItkrmip\12"
589-
"uHJXHF8Ah0blqvFeUsBNMmzIAZblbLBbnc27tbqzUkRRjtR59suExukCAwEAAaMh\12"
590-
"MB8wHQYDVR0OBBYEFCECHg0GKw4U7/NSdq7QmEXgLydVMA0GCSqGSIb3DQEBCwUA\12"
591-
"A4IBAQAz5CAdtEcTa830ClNmR/FRLi0OkjmBd2neylflvQcpoMP/26vkdcf+5JqH\12"
592-
"+WRemkv5X7BgkdAyiQcQXal33i7ykPFjYzH0myMfknIFvmuxexgBth0cPFOsZw3x\12"
593-
"ouQSEkvVuR4q8hW77o9um0e61cTI5Qi6oToA1VXTzkwu8tcY4JcFkgskf4xRX9Qf\12"
594-
"VhuoLllozdhjShd8abWvYdZZEX3EdNVjMHWojPgEvgQzjKOOMz+EbT8YsF9+Nu1p\12"
595-
"INYMLWZ/2KDTcKOHEF2E0YbCbxiSEi32tjD40u39XcidA7vh0w9bHEujeqdQa9fs\12"
596-
"LDeLr91cBnfxzH8fxEj4iMkyV7gj\12"
597-
"-----END CERTIFICATE-----\12";
598-
}
599560
static const char* multi_cert_pem() {
600-
std::string combo = dummy_pem();
561+
std::string combo = driver_invalid_pem();
601562
combo.append("\n");
602563
combo.append(cassandra_pem());
603564
return combo.c_str();

0 commit comments

Comments
 (0)