From e737c1e886fc528159b0194ab28ec1527a5bd559 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 24 Jun 2015 21:03:27 +0100 Subject: [PATCH] Check classpath before instantiating RSA --- .../cloud/bootstrap/encrypt/KeyProperties.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java index a35bcb44..df2e5fcc 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/KeyProperties.java @@ -18,6 +18,7 @@ package org.springframework.cloud.bootstrap.encrypt; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.io.Resource; import org.springframework.security.rsa.crypto.RsaAlgorithm; +import org.springframework.util.ClassUtils; @ConfigurationProperties("encrypt") public class KeyProperties { @@ -42,7 +43,13 @@ public class KeyProperties { /** * Rsa algorithm properties when using asymmetric encryption. */ - private Rsa rsa = new Rsa(); + private Rsa rsa; + + { + if (ClassUtils.isPresent("org.springframework.security.rsa.crypto.RsaAlgorithm", null)) { + this.rsa = new Rsa(); + } + } public Rsa getRsa() { return this.rsa;