SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use jks as the default KeyStore type (#1258)

Browse Source 
* Always use jks as the KeyStore type instead of trying to extract it from the resource extension.  Fixes #1176

* Use property to decide the type of KeyStore to create
This commit is contained in:
Ryan Baxter
2019-02-27 11:53:39 -05:00
committed by GitHub
parent 7493056d3c
commit 75838004ea
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
View File

@@ -97,7 +97,7 @@ public class EncryptionAutoConfiguration {
KeyStore keyStore = this.key.getKeyStore();
KeyStoreTextEncryptorLocator locator = new KeyStoreTextEncryptorLocator(
new KeyStoreKeyFactory(keyStore.getLocation(),
keyStore.getPassword().toCharArray()),
keyStore.getPassword().toCharArray(), key.getKeyStore().getType()),
keyStore.getSecret(), keyStore.getAlias());
RsaAlgorithm algorithm = this.rsaProperties.getAlgorithm();
locator.setRsaAlgorithm(algorithm);