Skip to content

Commit d23c1ef

Browse files
committed
1) Fix potential NPE in com.clickhouse.client.api.ssl.context.FromKeyStoreSslContextStrategy#createSSLContext
2) Correct PEM dashes
1 parent a79b22b commit d23c1ef

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

client-v2/src/main/java/com/clickhouse/client/api/ssl/context/FromKeyStoreSslContextStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SSLContext createSSLContext() {
3737
try (InputStream in = ClickHouseUtils.getFileInputStream(trustStorePath)) {
3838
SSLContext ctx = SSLContext.getInstance((String) config.get(ClientConfigProperties.SSL_PROTOCOL.getKey()));
3939
KeyStore myTrustStore = KeyStore.getInstance(keyStoreType);
40-
myTrustStore.load(in, truststorePassword.toCharArray());
40+
myTrustStore.load(in, truststorePassword != null ? truststorePassword.toCharArray() : null);
4141
TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
4242
factory.init(myTrustStore);
4343
ctx.init(null, factory.getTrustManagers(), new SecureRandom());

client-v2/src/main/java/com/clickhouse/client/api/ssl/keystore/DefaultCertificateKeyStoreManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
public final class DefaultCertificateKeyStoreManager implements CertificateKeyStoreManager {
2424

25-
private static final String PEM_HEADER_PREFIX = "---BEGIN ";
26-
private static final String PEM_HEADER_SUFFIX = " PRIVATE KEY---";
27-
private static final String PEM_FOOTER_PREFIX = "---END ";
25+
private static final String PEM_HEADER_PREFIX = "-----BEGIN ";
26+
private static final String PEM_HEADER_SUFFIX = " PRIVATE KEY-----";
27+
private static final String PEM_FOOTER_PREFIX = "-----END ";
2828

2929
private final Map<String, Object> config;
3030

0 commit comments

Comments
 (0)