root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.3.x'

This commit is contained in:
Dave Syer 2016-04-28 10:31:14 +01:00
parent c85948ac0c 9c0679b1f4
commit ebb0ff8638
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
View File

@ -109,6 +109,9 @@ public class RabbitAutoConfiguration {
RabbitProperties.Ssl ssl = config.getSsl(); RabbitProperties.Ssl ssl = config.getSsl();
if (ssl.isEnabled()) { if (ssl.isEnabled()) {
factory.setUseSSL(true); factory.setUseSSL(true);
if (ssl.getAlgorithm() != null) {
factory.setSslAlgorithm(ssl.getAlgorithm());
}
factory.setKeyStore(ssl.getKeyStore()); factory.setKeyStore(ssl.getKeyStore());
factory.setKeyStorePassphrase(ssl.getKeyStorePassword()); factory.setKeyStorePassphrase(ssl.getKeyStorePassword());
factory.setTrustStore(ssl.getTrustStore()); factory.setTrustStore(ssl.getTrustStore());

14
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@ -274,6 +274,12 @@ public class RabbitProperties {
*/ */
private String trustStorePassword; private String trustStorePassword;
/**
* The SSL algorithm to use (e.g. TLSv1.1). Default is set automatically by the
* rabbit client library.
*/
private String algorithm;
public boolean isEnabled() { public boolean isEnabled() {
return this.enabled; return this.enabled;
} }
@ -314,6 +320,14 @@ public class RabbitProperties {
this.trustStorePassword = trustStorePassword; this.trustStorePassword = trustStorePassword;
} }
public String getAlgorithm() {
return this.algorithm;
}
public void setAlgorithm(String sslAlgorithm) {
this.algorithm = sslAlgorithm;
}
} }
public static class Cache { public static class Cache {