Browse Source

Merge branch '3.4.x' into 3.5.x

Closes gh-46769
pull/47140/head
Stéphane Nicoll 4 months ago
parent
commit
5d0d3d7803
  1. 4
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java

@ -49,7 +49,7 @@ public interface SslOptions {
} }
/** /**
* Return the ciphers that can be used or an empty set. The cipher names in this set * Return the ciphers that can be used or {@code null}. The cipher names in this set
* should be compatible with those supported by * should be compatible with those supported by
* {@link SSLEngine#getSupportedCipherSuites()}. * {@link SSLEngine#getSupportedCipherSuites()}.
* @return the ciphers that can be used or {@code null} * @return the ciphers that can be used or {@code null}
@ -57,7 +57,7 @@ public interface SslOptions {
String[] getCiphers(); String[] getCiphers();
/** /**
* Return the protocols that should be enabled or an empty set. The protocols names in * Return the protocols that should be enabled or {@code null}. The protocols names in
* this set should be compatible with those supported by * this set should be compatible with those supported by
* {@link SSLEngine#getSupportedProtocols()}. * {@link SSLEngine#getSupportedProtocols()}.
* @return the protocols to enable or {@code null} * @return the protocols to enable or {@code null}

Loading…
Cancel
Save