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

Merge branch '3.5.x' 

Closes gh-46770
This commit is contained in:
Stéphane Nicoll 2025-08-11 11:14:27 +02:00
parent b8388e357b 5d0d3d7803
commit 759b8b11f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java
View File

@ -51,7 +51,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}
@ -59,7 +59,7 @@ public interface SslOptions {
String @Nullable [] getCiphers(); String @Nullable [] 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}