diff --git a/test/conf/cassandra_ssl_test.keystore b/test/conf/cassandra_ssl_test.keystore index 8b2b218efab6..739b8b5dd115 100644 Binary files a/test/conf/cassandra_ssl_test.keystore and b/test/conf/cassandra_ssl_test.keystore differ diff --git a/test/conf/cassandra_ssl_test.keystore.pem b/test/conf/cassandra_ssl_test.keystore.pem index ed981cce6a60..b447aab50ee0 100644 --- a/test/conf/cassandra_ssl_test.keystore.pem +++ b/test/conf/cassandra_ssl_test.keystore.pem @@ -1,51 +1,52 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIE6jAcBgoqhkiG9w0BDAEDMA4ECOWqSzq5PBIdAgIFxQSCBMjXsCK30J0aT3J/ -g5kcbmevTOY1pIhJGbf5QYYrMUPiuDK2ydxIbiPzoTE4/S+OkCeHhlqwn/YydpBl -xgjZZ1Z5rLJHO27d2biuESqanDiBVXYuVmHmaifRnFy0uUTFkStB5mjVZEiJgO29 -L83hL60uWru71EVuVriC2WCfmZ/EXp6wyYszOqCFQ8Quk/rDO6XuaBl467MJbx5V -sucGT6E9XKNd9hB14/Izb2jtVM5kqKxoiHpz1na6yhEYJiE5D1uOonznWjBnjwB/ -f0x+acpDfVDoJKTlRdz+DEcbOF7mb9lBVVjP6P/AAsmQzz6JKwHjvCrjYfQmyyN8 -RI4KRQnWgm4L3dtByLqY8HFU4ogisCMCgI+hZQ+OKMz/hoRO540YGiPcTRY3EOUR -0bd5JxU6tCJDMTqKP9aSL2KmLoiLowdMkSPz7TCzLsZ2bGJemuCfpAs4XT1vXCHs -evrUbOnh8et1IA8mZ9auThfqsZtNagJLEXA6hWIKp1FfVL3Q49wvMKZt4eTn/zwU -tLL0m5yPo6/HAaOA3hbm/oghZS0dseshXl7PZrmZQtvYnIvjyoxEL7ducYDQCDP6 -wZ7Nzyh1QZAauSS15hl3vLFRZCA9hWAVgwQAviTvhB342O0i9qI7TQkcHk+qcTPN -K+iGNbFZ8ma1izXNKSJ2PgI/QqFNIeJWvZrb9PhJRmaZVsTJ9fERm1ewpebZqkVv -zMqMhlKgx9ggAaSKgnGZkwXwB6GrSbbzUrwRCKm3FieD1QE4VVYevaadVUU75GG5 -mrFKorJEH7kFZlic8OTjDksYnHbcgU36XZrGEXa2+ldVeGKL3CsXWciaQRcJg8yo -WQDjZpcutGI0eMJWCqUkv8pYZC2/wZU4htCve5nVJUU4t9uuo9ex7lnwlLWPvheQ -jUBMgzSRsZ+zwaIusvufAAxiKK/cJm4ubZSZPIjBbfd4U7VPxtirP4Accydu7EK6 -eG/MZwtAMFNJxfxUR+/aYzJU/q1ePw7fWVHrpt58t/22CX2SJBEiUGmSmuyER4Ny -DPw6d6mhvPUS1jRhIZ9A81ht8MOX7VL5uVp307rt7o5vRpV1mo0iPiRHzGscMpJn -AP36klEAUNTf0uLTKZa7KHiwhn5iPmsCrENHkOKJjxhRrqHjD2wy3YHs3ow2voyY -Ua4Cids+c1hvRkNEDGNHm4+rKGFOGOsG/ZU7uj/6gflO4JXxNGiyTLflqMdWBvow -Zd7hk1zCaGAAn8nZ0hPweGxQ4Q30I9IBZrimGxB0vjiUqNio9+qMf33dCHFJEuut -ZGJMaUGVaPhXQcTy4uD5hzsPZV5xcsU4H3vBYyBcZgrusJ6OOgkuZQaU7p8rWQWr -bUEVbXuZdwEmxsCe7H/vEVv5+aA4sF4kWnMMFL7/LIYaiEzkTqdJlRv/KyJJgcAH -hg2BvR3XTAq8wiX0C98CdmTbsx2eyQdj5tCU606rEohFLKUxWkJYAKxCiUbxGGpI -RheVmxkef9ErxJiq7hsAsGrSJvMtJuDKIasnD14SOEwD/7jRAq6WdL9VLpxtzlOw -pWnIl8kUCO3WoaG9Jf+ZTIv2hnxJhaSzYrdXzGPNnaWKhBlwnXJRvQEdrIxZOimP -FujZhqbKUDbYAcqTkoQ= +MIIE6jAcBgoqhkiG9w0BDAEDMA4ECHQQRT5r0IzlAgIIAASCBMi0JvjwTU1QrPo6 +aklVRM+9aUomvqdZqNRIooBOyzhbFi7UrXwS1rkfpv4AVHLikVb5pdbTJE/IGHIk +k566oWUDbnWyL9EFjp95I1d6ce5A4n17NatNiR+y63E7f760QnvWJ5b5X5bAR0bW +cUh+r4FiCPjS8rPIPUHuTdi87cmQwqlWK8iKxE6ZE9j9oj16mY/RPBBycpzTUzKb +YaWDMTGIm4f/bMj10OTbIgRh0zqbF85nKgEJrHtVdBw0SvKTBHT/XG224pU9scDJ +GoAlFIvvV8C98gP8KMAFbDFlxiXFznYQwJVtJ/Hx7sHPNc3hRv8rCU8sr+svqGCH +D1g4myLWVh9+jqLdRbsxOXYkpcm34AwD3PUZh0KwhceER/h9zTPNEPAMG5DEYmOy +yu3hwAgkpBRgFlmpjsRdJYFpiRnKEo21u+NaV2BgSZH8oIUs0p3Ud2W/3ePWvsvI +S9ReEQgoWx9fi1jRsGgNYvg5h0QO4UIHj6eXjQwC5ITzZsQ2qZQJ2O1XOT6qpP3S +oMMYGvjydjkVpxtjFsyT/TT5t9bqTI6sufOY8V1HslmkgyxFcGko0HrOH353s9xC +1CS1dZ07RcfC02y3/8G1kge68+kS2GJ4/Yhc7UbI1Hds5jgUyyaRYhQh6BnSW9Ap +USLoboC7gKvSE3eRnD9tTfif9bCJSKmNvvKsI8Ge6Z1l4WSgfvxScqEGzaiNWzHH +y66q3jMeDThdg/EikAj706RlgGt+2arobwUnajx6yCMrUeeS77hxP38kARwRC0Yz +qxB2BP9dG7dAWAxvn9A2POz6OGECI9Wt2MGo9L7jSA/KETQxS+TMVj0siG5UsLpi +vlYM5sbsd59bboKQCrqdeYDHBT15/lZPWsSttAohdoDki+e0mQJmDI/fJFGr/zK3 +RJQ6Lr8MaeeNDyvVsRiQmNA8Jh3Vk8O4hwjZ1JWsN1MwYNUWi4vxLSUbT76FoyIf +mlZEUii9NHg+brFsLgUWKD0MAfso8e1lKh/nvqDRu62esNMVBd7RcXmqz2oHZZf1 +08KEGK45FttNwjGMDsoh8s0lShOuOatY9dspzpdRwurlQvuE6FYzYF/IZC5nHxZh +i/+OL5RVITsv3CaCAxUFHHGEeJlhYlWCoAWSNRKohos0PwHDZ5FzqTdx9no6Pkja +JMxlgg1mCp1uRXCMrObuL8QDyK0qFKd15hXH1SELstVX65VM3nzSUiJQMvIA01zE +MpLVqK+ZtLbc7fLvNvMXCeRvaT/NMEb2KwOrjyVQ9llMhyejD7Mv5gebtNA/Nuey +fYgGbKfvL+tfjUvalAiDM04Ab0BewuqnKGc2H3Vbs8J+wcdhjmOfbYVP283NGYlZ +GUtI0uroILXS8RJL22SFhwyfxOu843WLCcLo9i7bKl+u4agymINWFD1VGH0vMk5u +trI90ftSDwXnWT8iWNkuMrrtMbYYEHRKCKYC2Ja56fTCq+uxCRQ4uwtalJvW01DO +NWWv/Xj1xQ+BuOAXAuogdYsL2FFVI2J3B5XukA24qm90LLPl5I+AI8qdAydbdPnT +hZX4WXcWyg3xcHWwgPkFoB40OquoI6Lz7+VQDLS3smhSmESgBhy+qnEOrx05tM03 +uauB9dHXVa3F0XhB2Qo= -----END ENCRYPTED PRIVATE KEY----- -----BEGIN CERTIFICATE----- -MIIDkTCCAnmgAwIBAgIETxH5JDANBgkqhkiG9w0BAQsFADB5MRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRQwEgYDVQQLDAtzc2xfdGVzdGluZzEZMBcGA1UEAxMQQXBh -Y2hlIENhc3NhbmRyYTAeFw0xNjAzMTgyMTI4MDJaFw0xNjA2MTYyMTI4MDJaMHkx -EDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vu -a25vd24xEDAOBgNVBAoTB1Vua25vd24xFDASBgNVBAsMC3NzbF90ZXN0aW5nMRkw -FwYDVQQDExBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAjkmVX/HS49cS8Hn6o26IGwMIcEV3d7ZhH0GNcx8rnSRd10dU9F6d -ugSjbwGFMcWUQzYNejN6az0Wb8JIQyXRPTWjfgaWTyVGr0bGTnxg6vwhzfI/9jzy -q59xv29OuSY1dxmY31f0pZ9OOw3mabWksjoO2TexfKoxqsRHJ8PrM1f8E84Z4xo2 -TJXGzpuIxRkAJ+sVDqKEAhrKAfRYMSgdJ7zRt8VXv9ngjX20uA2m092NcH0Kmeto -TmuWUtK8E/qcN7ULN8xRWNUn4hu6mG6mayk4XliGRqI1VZupqh+MgNqHznuTd0bA -YrQsFPw9HaZ2hvVnJffJ5l7njAekZNOL+wIDAQABoyEwHzAdBgNVHQ4EFgQUcdiD -N6aylI91kAd34Hl2AzWY51QwDQYJKoZIhvcNAQELBQADggEBAG9q29ilUgCWQP5v -iHkZHj10gXGEoMkdfrPBf8grC7dpUcaw1Qfku/DJ7kPvMALeEsmFDk/t78roeNbh -IYBLJlzI1HZN6VPtpWQGsqxltAy5XN9Xw9mQM/tu70ShgsodGmE1UoW6eE5+/GMv -6Fg+zLuICPvs2cFNmWUvukN5LW146tJSYCv0Q/rCPB3m9dNQ9pBxrzPUHXw4glwG -qGnGddXmOC+tSW5lDLLG1BRbKv4zxv3UlrtIjqlJtZb/sQMT6WtG2ihAz7SKOBHa -HOWUwuPTetWIuJCKP7P4mWWtmSmjLy+BFX5seNEngn3RzJ2L8uuTJQ/88OsqgGru -n3MVF9w= +MIIDyzCCArOgAwIBAgIUFQcij5VSD+aWUjrprTpr9Eat5ogwDQYJKoZIhvcNAQEL +BQAweTEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UE +BwwHVW5rbm93bjEQMA4GA1UECgwHVW5rbm93bjEUMBIGA1UECwwLc3NsX3Rlc3Rp +bmcxGTAXBgNVBAMMEEFwYWNoZSBDYXNzYW5kcmEwIBcNMjYwNjA5MTIxNDUzWhgP +MjEyNjA1MTYxMjE0NTNaMHkxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgMB1Vu +a25vd24xEDAOBgNVBAcMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xFDASBgNV +BAsMC3NzbF90ZXN0aW5nMRkwFwYDVQQDDBBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPIuqo5Sr/bH+nT1LeHW6dgxnYuc +EIGmX7x/7KRC/9Wal/myQXf0xgLxuRxffy6enkqHPxuHIMIW8wzPOOJCIRvVM//F +RWjRMrANz+Rx37VtTIg6ishNVGkrhmE2QoUWDIfZfeUItSBAKriHnF0TVPWNwiY+ +j2EZb8uJohzoZNUIRQFRAJYPvPkU5ANLxYNXjCGqNQcaj+/rB00BDe/G1fwB8czs +MygfMpgINosFJoVEf4iW7kQxoWbjbE+4FlXAkG1ku9mkkblJJIG0B0bkwulPkuhW +Ly7YoFMpq9SBmPEVf7aUx9ZlUhXRyIisKHQGdBYT9f7YXJSmsHDS+vEZ7QIDAQAB +o0kwRzAdBgNVHQ4EFgQUMN6gupxWKgTDRC6NxM4d7Ir2HnswJgYDVR0RBB8wHYIJ +bG9jYWxob3N0hwR/AAABhwR/AAAChwR/AAADMA0GCSqGSIb3DQEBCwUAA4IBAQBu +OgdzPIcX3o/YNmw+GxRAJmIUni0s9VenA2koC6Vy5AxnSKLhLwO6Q5CyMR8fMRJm +35e5n5VpvELj5bhLfWb5tANNzNJxsEMYyc2VOPEBer2HeJ4LAlEiDF8sBDAjbzE+ ++4FcIjG+VuemQLRxSL1As6k8Z+u8H+19ckAogbDcgkR5E/j+rVSvzgBhA4jWCogU +zjcvlz9HrdGATSn5ysv0aM/AbiY6gOmNsem02jMiFh/qO4EcOEaO7lhISFKTUtKv +zL5YyDRMOU1zJa0Ku05s1GA/ioKt8p72yid+DxuoS3noIlyOJF+dasgJh0QIlJmz ++dADc97efgsjhrmVWs5n -----END CERTIFICATE----- diff --git a/test/conf/cassandra_ssl_test.truststore b/test/conf/cassandra_ssl_test.truststore index 8c21d853697c..3f0e7da1beae 100644 Binary files a/test/conf/cassandra_ssl_test.truststore and b/test/conf/cassandra_ssl_test.truststore differ diff --git a/test/conf/cassandra_ssl_test.truststore.pem b/test/conf/cassandra_ssl_test.truststore.pem index 8806ce818bba..7f520927fc14 100644 --- a/test/conf/cassandra_ssl_test.truststore.pem +++ b/test/conf/cassandra_ssl_test.truststore.pem @@ -1,22 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDkTCCAnmgAwIBAgIETxH5JDANBgkqhkiG9w0BAQsFADB5MRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRQwEgYDVQQLDAtzc2xfdGVzdGluZzEZMBcGA1UEAxMQQXBh -Y2hlIENhc3NhbmRyYTAeFw0xNjAzMTgyMTI4MDJaFw0xNjA2MTYyMTI4MDJaMHkx -EDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vu -a25vd24xEDAOBgNVBAoTB1Vua25vd24xFDASBgNVBAsMC3NzbF90ZXN0aW5nMRkw -FwYDVQQDExBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAjkmVX/HS49cS8Hn6o26IGwMIcEV3d7ZhH0GNcx8rnSRd10dU9F6d -ugSjbwGFMcWUQzYNejN6az0Wb8JIQyXRPTWjfgaWTyVGr0bGTnxg6vwhzfI/9jzy -q59xv29OuSY1dxmY31f0pZ9OOw3mabWksjoO2TexfKoxqsRHJ8PrM1f8E84Z4xo2 -TJXGzpuIxRkAJ+sVDqKEAhrKAfRYMSgdJ7zRt8VXv9ngjX20uA2m092NcH0Kmeto -TmuWUtK8E/qcN7ULN8xRWNUn4hu6mG6mayk4XliGRqI1VZupqh+MgNqHznuTd0bA -YrQsFPw9HaZ2hvVnJffJ5l7njAekZNOL+wIDAQABoyEwHzAdBgNVHQ4EFgQUcdiD -N6aylI91kAd34Hl2AzWY51QwDQYJKoZIhvcNAQELBQADggEBAG9q29ilUgCWQP5v -iHkZHj10gXGEoMkdfrPBf8grC7dpUcaw1Qfku/DJ7kPvMALeEsmFDk/t78roeNbh -IYBLJlzI1HZN6VPtpWQGsqxltAy5XN9Xw9mQM/tu70ShgsodGmE1UoW6eE5+/GMv -6Fg+zLuICPvs2cFNmWUvukN5LW146tJSYCv0Q/rCPB3m9dNQ9pBxrzPUHXw4glwG -qGnGddXmOC+tSW5lDLLG1BRbKv4zxv3UlrtIjqlJtZb/sQMT6WtG2ihAz7SKOBHa -HOWUwuPTetWIuJCKP7P4mWWtmSmjLy+BFX5seNEngn3RzJ2L8uuTJQ/88OsqgGru -n3MVF9w= +MIIDyzCCArOgAwIBAgIUFQcij5VSD+aWUjrprTpr9Eat5ogwDQYJKoZIhvcNAQEL +BQAweTEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UE +BwwHVW5rbm93bjEQMA4GA1UECgwHVW5rbm93bjEUMBIGA1UECwwLc3NsX3Rlc3Rp +bmcxGTAXBgNVBAMMEEFwYWNoZSBDYXNzYW5kcmEwIBcNMjYwNjA5MTIxNDUzWhgP +MjEyNjA1MTYxMjE0NTNaMHkxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgMB1Vu +a25vd24xEDAOBgNVBAcMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xFDASBgNV +BAsMC3NzbF90ZXN0aW5nMRkwFwYDVQQDDBBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPIuqo5Sr/bH+nT1LeHW6dgxnYuc +EIGmX7x/7KRC/9Wal/myQXf0xgLxuRxffy6enkqHPxuHIMIW8wzPOOJCIRvVM//F +RWjRMrANz+Rx37VtTIg6ishNVGkrhmE2QoUWDIfZfeUItSBAKriHnF0TVPWNwiY+ +j2EZb8uJohzoZNUIRQFRAJYPvPkU5ANLxYNXjCGqNQcaj+/rB00BDe/G1fwB8czs +MygfMpgINosFJoVEf4iW7kQxoWbjbE+4FlXAkG1ku9mkkblJJIG0B0bkwulPkuhW +Ly7YoFMpq9SBmPEVf7aUx9ZlUhXRyIisKHQGdBYT9f7YXJSmsHDS+vEZ7QIDAQAB +o0kwRzAdBgNVHQ4EFgQUMN6gupxWKgTDRC6NxM4d7Ir2HnswJgYDVR0RBB8wHYIJ +bG9jYWxob3N0hwR/AAABhwR/AAAChwR/AAADMA0GCSqGSIb3DQEBCwUAA4IBAQBu +OgdzPIcX3o/YNmw+GxRAJmIUni0s9VenA2koC6Vy5AxnSKLhLwO6Q5CyMR8fMRJm +35e5n5VpvELj5bhLfWb5tANNzNJxsEMYyc2VOPEBer2HeJ4LAlEiDF8sBDAjbzE+ ++4FcIjG+VuemQLRxSL1As6k8Z+u8H+19ckAogbDcgkR5E/j+rVSvzgBhA4jWCogU +zjcvlz9HrdGATSn5ysv0aM/AbiY6gOmNsem02jMiFh/qO4EcOEaO7lhISFKTUtKv +zL5YyDRMOU1zJa0Ku05s1GA/ioKt8p72yid+DxuoS3noIlyOJF+dasgJh0QIlJmz ++dADc97efgsjhrmVWs5n -----END CERTIFICATE----- diff --git a/test/conf/cassandra_ssl_test.unencrypted_keystore.pem b/test/conf/cassandra_ssl_test.unencrypted_keystore.pem index ce3d8e7584bd..d04f79960cf9 100644 --- a/test/conf/cassandra_ssl_test.unencrypted_keystore.pem +++ b/test/conf/cassandra_ssl_test.unencrypted_keystore.pem @@ -1,50 +1,51 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCOSZVf8dLj1xLw -efqjbogbAwhwRXd3tmEfQY1zHyudJF3XR1T0Xp26BKNvAYUxxZRDNg16M3prPRZv -wkhDJdE9NaN+BpZPJUavRsZOfGDq/CHN8j/2PPKrn3G/b065JjV3GZjfV/Sln047 -DeZptaSyOg7ZN7F8qjGqxEcnw+szV/wTzhnjGjZMlcbOm4jFGQAn6xUOooQCGsoB -9FgxKB0nvNG3xVe/2eCNfbS4DabT3Y1wfQqZ62hOa5ZS0rwT+pw3tQs3zFFY1Sfi -G7qYbqZrKTheWIZGojVVm6mqH4yA2ofOe5N3RsBitCwU/D0dpnaG9Wcl98nmXueM -B6Rk04v7AgMBAAECggEAYnxIKjrFz/JkJ5MmiszM5HV698r9YB0aqHnFIHPoykIL -uiCjiumantDrFsCkosixULwvI/BRwbxstTpyrheU9psT6P1CONICVPvV8ylgJAYU -l+ofn56cEXKxVuICSWFLDH7pM1479g+IJJQAchbKQpqxAGTuMu3SpvJolfuj5srt -bM7/RYhJFLwDuvHNA3ivlogMneItP03+C25aaxstM+lBuBf68+n78zMgSvt6J/6Y -G2TOMKnxveMlG2qu9l2lAw/2i8daG/qre08nTH7wpRx0gZLZqNpe45exkrzticzF -FgWYjG2K2brX21jqHroFgMhdXF7zhhRgLoIeC0BrIQKBgQDCfGfWrJESKBbVai5u -7wqD9nlzjv6N6FXfTDOPXO1vz5frdvtLVWbs0SMPy+NglkaZK0iqHvb9mf2of8eC -0D5cmewjn7WCDBQMypIMYgT912ak/BBVuGXcxb6UgD+xARfSARo2C8NG1hfprw1W -ad14CjS5xhFMs44HpVYhI7iPYwKBgQC7SqVG/b37vZ7CINemdvoMujLvvYXDJJM8 -N21LqNJfVXdukdH3T0xuLnh9Z/wPHjJDMF/9+1foxSEPHijtyz5P19EilNEC/3qw -fI19+VZoY0mdhPtXSGzy+rbTE2v71QgwFLizSos14Gr+eNiIjF7FYccK05++K/zk -cd8ZA3bwiQKBgQCl+HTFBs9mpz+VMOAfW2+l3hkXPNiPUc62mNkHZ05ZNNd44jjh -uSf0wSUiveR08MmevQlt5K7zDQ8jVKh2QjB15gVXAVxsdtJFeDnax2trFP9LnLBz -9sE2/qn9INU5wK0LUlWD+dXUBbCyg+jl7cJKRqtoPldVFYYHkFlIPqup8QKBgHXv -hyuw1FUVDkdHzwOvn70r8q8sNHKxMVWVwWkHIZGOi+pAQGrusD4hXRX6yKnsZdIR -QCD6iFy25R5T64nxlYdJaxPPid3NakB/7ckJnPOWseBSwMIxhQlr/nvjmve1Kba9 -FaEwq4B9lGIxToiNe4/nBiM3JzvlDxX67nUdzWOhAoGAdFvriyvjshSJ4JHgIY9K -37BVB0VKMcFV2P8fLVWO5oyRtE1bJhU4QVpQmauABU4RGSojJ3NPIVH1wxmJeYtj -Q3b7EZaqI6ovna2eK2qtUx4WwxhRaXTT8xueBI2lgL6sBSTGG+K69ZOzGQzG/Mfr -RXKInnLInFD9JD94VqmMozo= +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCw8i6qjlKv9sf6 +dPUt4dbp2DGdi5wQgaZfvH/spEL/1ZqX+bJBd/TGAvG5HF9/Lp6eSoc/G4cgwhbz +DM844kIhG9Uz/8VFaNEysA3P5HHftW1MiDqKyE1UaSuGYTZChRYMh9l95Qi1IEAq +uIecXRNU9Y3CJj6PYRlvy4miHOhk1QhFAVEAlg+8+RTkA0vFg1eMIao1BxqP7+sH +TQEN78bV/AHxzOwzKB8ymAg2iwUmhUR/iJbuRDGhZuNsT7gWVcCQbWS72aSRuUkk +gbQHRuTC6U+S6FYvLtigUymr1IGY8RV/tpTH1mVSFdHIiKwodAZ0FhP1/thclKaw +cNL68RntAgMBAAECggEASybI+CpTZyXmgHLNMSwChbYLOJDzezU9btrV8DFBvXvA +2Xw1H8YtYS4d8RNiYddwieU4dO6hoSGd8qOFnXDHSl2SWy/t3pFqjF8mtp2dWbiq +D7+qMYhqA4hZcoz2KSFyIGdQUb6FSLxGVH6kJh6H1+UkzIlGt8mzLn6hWYdykmQM +76uxEp0qqPVr15QtjrYBl9F4iUh2D6UHIIE5CUtAablZEXbzApxUr0oFrPigQpjU +DP/IzexGneD8gg8ulU1XxUkZRJGD0Wv1zr7bi7lAYSeULsjt5fD8n1Z8+Llw7Mgz +b2Clzjgs1k0gQbBnE3nvo8ZFdHXnYB5sDMOIzSMwJwKBgQDmaC3THefkbsSIACGW +h99xC61ngasYn1GykFHGMdcPbsIt1hU3Reiq+21RIX1iUrP9I0vd8Elm9MYC/v0L +j2pnVekWcR6ME9kUJNIkyFAohfKMbT/BFreDJwJpzTnHFNb8hXrnpDMPGRzHq/Gi +t8tsXSIwK3KBIBeYSEEggFkvjwKBgQDEmcuuWhz9ELibGZDO156XPxDgccPN4fdP +wHfxn0ShmMq6YXp1RbHDc/oahJ4LRzbVRTfTsJINq4hzLEA5FplWFiglBJJk+MVm +TZy/obwPici49mI/5MrpvBO371uiYDjxa2Uaf/35keo0L6GhL6SyVhCYySbKiqcm +gIHxVfAgwwKBgGM5FBrpsxaFuS8UV2KbCteE/t0nU0ZcPfOXARBIIGRt/0N8AVD3 +UzZm5nHc6UExen+V9rMSKpoi6S8bHmAfF+R+c82NU2lhlsd8/96FQTfiT0y4M490 +t/zMDNcBYVNhnx/KX95nsPFckC9Q1dOMMRdumC2EWGBRMLgMzbcwbrfzAoGABX1d +6KJviMl8vif6mSwAK60BJaNHmmoi48E2GDMgUXrYvleWecvWaOTGKRNm7l2wtEfY +hTq6+VK+3qhvqqhs47B+snnsNJGVwYONSvSTMcPhLPkESVB0Mg6kZlByuJgDPwqG +qjTEvMFMTuS9mKih6rDoibukL6erfzG7bye9Ks0CgYEAumIui49lXJR5rB5fNevF +XzGHxkhofpx7y2Fdtpym7rK46AVagKF7jqa/XuFk1P37KgEhrTPtnCkICwjjhoUD +yYJggN07TUGIU+9WD4RQ+tvBpyLl1gEtwpCVw4k3hkRlulA5wDQjtDgf4FPLgphX +hbzjlSLJkHJYOthBGLrEsG0= -----END PRIVATE KEY----- -----BEGIN CERTIFICATE----- -MIIDkTCCAnmgAwIBAgIETxH5JDANBgkqhkiG9w0BAQsFADB5MRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRQwEgYDVQQLDAtzc2xfdGVzdGluZzEZMBcGA1UEAxMQQXBh -Y2hlIENhc3NhbmRyYTAeFw0xNjAzMTgyMTI4MDJaFw0xNjA2MTYyMTI4MDJaMHkx -EDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vu -a25vd24xEDAOBgNVBAoTB1Vua25vd24xFDASBgNVBAsMC3NzbF90ZXN0aW5nMRkw -FwYDVQQDExBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAjkmVX/HS49cS8Hn6o26IGwMIcEV3d7ZhH0GNcx8rnSRd10dU9F6d -ugSjbwGFMcWUQzYNejN6az0Wb8JIQyXRPTWjfgaWTyVGr0bGTnxg6vwhzfI/9jzy -q59xv29OuSY1dxmY31f0pZ9OOw3mabWksjoO2TexfKoxqsRHJ8PrM1f8E84Z4xo2 -TJXGzpuIxRkAJ+sVDqKEAhrKAfRYMSgdJ7zRt8VXv9ngjX20uA2m092NcH0Kmeto -TmuWUtK8E/qcN7ULN8xRWNUn4hu6mG6mayk4XliGRqI1VZupqh+MgNqHznuTd0bA -YrQsFPw9HaZ2hvVnJffJ5l7njAekZNOL+wIDAQABoyEwHzAdBgNVHQ4EFgQUcdiD -N6aylI91kAd34Hl2AzWY51QwDQYJKoZIhvcNAQELBQADggEBAG9q29ilUgCWQP5v -iHkZHj10gXGEoMkdfrPBf8grC7dpUcaw1Qfku/DJ7kPvMALeEsmFDk/t78roeNbh -IYBLJlzI1HZN6VPtpWQGsqxltAy5XN9Xw9mQM/tu70ShgsodGmE1UoW6eE5+/GMv -6Fg+zLuICPvs2cFNmWUvukN5LW146tJSYCv0Q/rCPB3m9dNQ9pBxrzPUHXw4glwG -qGnGddXmOC+tSW5lDLLG1BRbKv4zxv3UlrtIjqlJtZb/sQMT6WtG2ihAz7SKOBHa -HOWUwuPTetWIuJCKP7P4mWWtmSmjLy+BFX5seNEngn3RzJ2L8uuTJQ/88OsqgGru -n3MVF9w= +MIIDyzCCArOgAwIBAgIUFQcij5VSD+aWUjrprTpr9Eat5ogwDQYJKoZIhvcNAQEL +BQAweTEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UE +BwwHVW5rbm93bjEQMA4GA1UECgwHVW5rbm93bjEUMBIGA1UECwwLc3NsX3Rlc3Rp +bmcxGTAXBgNVBAMMEEFwYWNoZSBDYXNzYW5kcmEwIBcNMjYwNjA5MTIxNDUzWhgP +MjEyNjA1MTYxMjE0NTNaMHkxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgMB1Vu +a25vd24xEDAOBgNVBAcMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xFDASBgNV +BAsMC3NzbF90ZXN0aW5nMRkwFwYDVQQDDBBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPIuqo5Sr/bH+nT1LeHW6dgxnYuc +EIGmX7x/7KRC/9Wal/myQXf0xgLxuRxffy6enkqHPxuHIMIW8wzPOOJCIRvVM//F +RWjRMrANz+Rx37VtTIg6ishNVGkrhmE2QoUWDIfZfeUItSBAKriHnF0TVPWNwiY+ +j2EZb8uJohzoZNUIRQFRAJYPvPkU5ANLxYNXjCGqNQcaj+/rB00BDe/G1fwB8czs +MygfMpgINosFJoVEf4iW7kQxoWbjbE+4FlXAkG1ku9mkkblJJIG0B0bkwulPkuhW +Ly7YoFMpq9SBmPEVf7aUx9ZlUhXRyIisKHQGdBYT9f7YXJSmsHDS+vEZ7QIDAQAB +o0kwRzAdBgNVHQ4EFgQUMN6gupxWKgTDRC6NxM4d7Ir2HnswJgYDVR0RBB8wHYIJ +bG9jYWxob3N0hwR/AAABhwR/AAAChwR/AAADMA0GCSqGSIb3DQEBCwUAA4IBAQBu +OgdzPIcX3o/YNmw+GxRAJmIUni0s9VenA2koC6Vy5AxnSKLhLwO6Q5CyMR8fMRJm +35e5n5VpvELj5bhLfWb5tANNzNJxsEMYyc2VOPEBer2HeJ4LAlEiDF8sBDAjbzE+ ++4FcIjG+VuemQLRxSL1As6k8Z+u8H+19ckAogbDcgkR5E/j+rVSvzgBhA4jWCogU +zjcvlz9HrdGATSn5ysv0aM/AbiY6gOmNsem02jMiFh/qO4EcOEaO7lhISFKTUtKv +zL5YyDRMOU1zJa0Ku05s1GA/ioKt8p72yid+DxuoS3noIlyOJF+dasgJh0QIlJmz ++dADc97efgsjhrmVWs5n -----END CERTIFICATE----- diff --git a/test/conf/cassandra_ssl_test_nopassword.keystore b/test/conf/cassandra_ssl_test_nopassword.keystore index 8778a3876b27..fed6bbdc9675 100644 Binary files a/test/conf/cassandra_ssl_test_nopassword.keystore and b/test/conf/cassandra_ssl_test_nopassword.keystore differ diff --git a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java index 43bed8730903..6a225a6626f7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java @@ -98,7 +98,11 @@ public void bulkLoaderSuccessfullyStreamsOverSsl() throws Throwable "--truststore", validTrustStorePath, "--truststore-password", validTrustStorePassword, "--conf-path", "test/conf/sstableloader_with_encryption.yaml", - "--ssl-ciphers", "TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA", + // TLS_RSA_* ciphers are disabled by default in JDK 11.0.20+ (jdk.tls.disabledAlgorithms); + // ECDHE variants are appended so the handshake succeeds on modern JDKs while + // preserving the original intent of exercising explicit cipher-suite negotiation. + "--ssl-ciphers", "TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA," + + "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", sstables_to_upload.absolutePath()); tool.assertOnCleanExit(); assertTrue(tool.getStdout().contains("Summary statistics")); diff --git a/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java b/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java index 5dfb75b3d37a..8b7d82197408 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java @@ -235,9 +235,10 @@ public void testMutualTlsAuthenticationFailedWithUntrustedCertificate() throws E { configureMutualTlsAuthenticator(); // optionally match source/port because in MacOS source/port are null + // optionally match TLS alert prefix e.g. "(certificate_required) " prepended on some JDK/Netty versions CharSequence expectedLogStringRegex = "^user:null\\|host:.*/127.0.0.1:\\d+(\\|source:/127.0.0.1\\|port:\\d+)?" + "\\|timestamp:\\d+\\|type:LOGIN_ERROR\\|category:AUTH" + - "\\|operation:LOGIN FAILURE; Empty client certificate chain.*$"; + "\\|operation:LOGIN FAILURE; (?:\\([^)]+\\) )?Empty client certificate chain.*$"; Path untrustedCertPath = generateSelfSignedCertificate(null, tempFolder.getRoot()); testMtlsAuthenticationFailure(untrustedCertPath, "Authentication should fail with a self-signed certificate", expectedLogStringRegex);