Skip to content

[UNDERTOW-2491] Add default constant for SSL_USER_CIPHER_SUITES_ORDER option #1784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[UNDERTOW-2491] Add default constant for SSL_USER_CIPHER_SUITES_ORDER option #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions core/src/main/java/io/undertow/UndertowOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,15 @@ public class UndertowOptions {

/**
* If the SSLEngine should prefer the servers cipher version. Only applicable on JDK8+.
* Defaults to {@link #DEFAULT_SSL_USER_CIPHER_SUITES_ORDER}.
*/
public static final Option<Boolean> SSL_USER_CIPHER_SUITES_ORDER = Option.simple(UndertowOptions.class, "SSL_USER_CIPHER_SUITES_ORDER", Boolean.class);

/**
* Default value of {@link #SSL_USER_CIPHER_SUITES_ORDER} option.
*/
public static final boolean DEFAULT_SSL_USER_CIPHER_SUITES_ORDER = false;

/**
* This option forces {@link io.undertow.protocols.ssl.UndertowXnioSsl} to use a specific
* name as the {@link javax.net.ssl.SNIHostName} for a client connection. If the option is
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/undertow/protocols/ssl/UndertowAcceptingSslChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class UndertowAcceptingSslChannel implements AcceptingChannel<SslConnection> {
closeSetter = ChannelListeners.<AcceptingChannel<SslConnection>>getDelegatingSetter(tcpServer.getCloseSetter(), this);
//noinspection ThisEscapedInObjectConstruction
acceptSetter = ChannelListeners.<AcceptingChannel<SslConnection>>getDelegatingSetter(tcpServer.getAcceptSetter(), this);
useCipherSuitesOrder = optionMap.get(UndertowOptions.SSL_USER_CIPHER_SUITES_ORDER, false);
useCipherSuitesOrder = optionMap.get(UndertowOptions.SSL_USER_CIPHER_SUITES_ORDER, UndertowOptions.DEFAULT_SSL_USER_CIPHER_SUITES_ORDER);
}

private static final Set<Option<?>> SUPPORTED_OPTIONS = Option.setBuilder()
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/undertow/protocols/ssl/UndertowXnioSsl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ private static SSLEngine createSSLEngine(SSLContext sslContext, OptionMap option
}
}
}
boolean useCipherSuitesOrder = optionMap.get(UndertowOptions.SSL_USER_CIPHER_SUITES_ORDER, false);
boolean useCipherSuitesOrder = optionMap.get(UndertowOptions.SSL_USER_CIPHER_SUITES_ORDER, UndertowOptions.DEFAULT_SSL_USER_CIPHER_SUITES_ORDER);
if (useCipherSuitesOrder) {
SSLParameters sslParameters = engine.getSSLParameters();
sslParameters.setUseCipherSuitesOrder(true);
Expand Down
Loading