Merge branch '2.7.x'

2 years ago · 543d9c6e66
parent a28ca4594b 71526bf44f
commit 543d9c6e66
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizer.java
@ -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 {