This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from b7ec523aa9 Merge branch 'cassandra-4.1' into trunk
add bd49f6ff26 Allow keystore and truststore passwords to be nullable
new 531b4cde43 Merge branch 'cassandra-4.1' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
NEWS.txt | 4 +
conf/cassandra.yaml | 16 +-
.../KubernetesSecretsPEMSslContextFactory.java | 4 +-
.../KubernetesSecretsSslContextFactory.java | 25 +--
.../KubernetesSecretsPEMSslContextFactoryTest.java | 10 +-
.../KubernetesSecretsSslContextFactoryTest.java | 32 ++--
.../apache/cassandra/config/EncryptionOptions.java | 9 +-
.../security/FileBasedSslContextFactory.java | 34 +++-
.../security/PEMBasedSslContextFactory.java | 5 -
.../org/apache/cassandra/security/PEMReader.java | 3 +-
...m-sslcontextfactory-mismatching-passwords.yaml} | 3 +
...dra-pem-sslcontextfactory-unencryptedkeys.yaml} | 105 ++++++------
.../security/DefaultSslContextFactoryTest.java | 4 +-
.../security/FileBasedSslContextFactoryTest.java | 182 +++++++++++++++++++++
...FactoryConfigWithMismatchingPasswordsTest.java} | 56 +++++--
...ntextFactoryConfigWithUnencryptedKeysTest.java} | 5 +-
17 files changed, 382 insertions(+), 116 deletions(-)
copy test/conf/{cassandra-pem-sslcontextfactory.yaml =>
cassandra-pem-sslcontextfactory-mismatching-passwords.yaml} (98%)
copy test/conf/{cassandra-pem-sslcontextfactory.yaml =>
cassandra-pem-sslcontextfactory-unencryptedkeys.yaml} (53%)
create mode 100644
test/unit/org/apache/cassandra/security/FileBasedSslContextFactoryTest.java
copy
test/unit/org/apache/cassandra/security/{PEMBasedSslContextFactoryInvalidConfigTest.java
=> PEMBasedSslContextFactoryConfigWithMismatchingPasswordsTest.java} (51%)
copy
test/unit/org/apache/cassandra/security/{PEMBasedSslContextFactoryConfigTest.java
=> PEMBasedSslContextFactoryConfigWithUnencryptedKeysTest.java} (94%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
