Merge branch '2.7.x'

This commit is contained in:
Andy Wilkinson
2022-06-25 13:47:45 +01:00

View File

@@ -95,7 +95,7 @@ class SslConnectorCustomizer implements TomcatConnectorCustomizer {
configureSslStoreProvider(protocol, sslHostConfig, certificate, sslStoreProvider);
String keyPassword = sslStoreProvider.getKeyPassword();
if (keyPassword != null) {
certificate.setCertificateKeyPassword(ciphers);
certificate.setCertificateKeyPassword(keyPassword);
}
}
else {