From 4f54e73545063d1fd9585f28a2594f390f33ee32 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 1 Jan 2018 16:45:48 -0500 Subject: [PATCH] Updates for changes in encryption defaults --- .../config/server/config/EncryptionAutoConfiguration.java | 4 ++-- .../config/server/BootstrapConfigServerIntegrationTests.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java index 6dfab2a6..124747b2 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java @@ -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; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java index c4a003d1..167365e8 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java @@ -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 {