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

Updates for changes in encryption defaults

Browse Source
This commit is contained in:
Spencer Gibb
2018-01-01 16:45:48 -05:00
parent 9b0c043f34
commit 4f54e73545
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,8 +93,8 @@ public class EncryptionAutoConfiguration {
KeyStoreTextEncryptorLocator locator = new KeyStoreTextEncryptorLocator(
new KeyStoreKeyFactory(keyStore.getLocation(), keyStore.getPassword().toCharArray()),
keyStore.getSecret(), keyStore.getAlias());
String algorithm = this.key.getRsa().getAlgorithm();
locator.setRsaAlgorithm(RsaAlgorithm.valueOf(algorithm.toUpperCase()));
RsaAlgorithm algorithm = this.key.getRsa().getAlgorithm();
locator.setRsaAlgorithm(algorithm);
locator.setSalt(this.key.getRsa().getSalt());
locator.setStrong(this.key.getRsa().isStrong());
return locator;

3
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java
View File

@@ -18,7 +18,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ConfigServerApplication.class, properties = "spring.cloud.bootstrap.name:enable-bootstrap",
@SpringBootTest(classes = ConfigServerApplication.class, properties = {"spring.cloud.bootstrap.name:enable-bootstrap",
"encrypt.rsa.algorithm=DEFAULT", "encrypt.rsa.strong=false"},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ActiveProfiles({"test", "encrypt"})
public class BootstrapConfigServerIntegrationTests {