Skip to content

RH2020290: Support TLS 1.3 in FIPS mode #13

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

Merged
merged 1 commit into from
Aug 29, 2022
Merged

RH2020290: Support TLS 1.3 in FIPS mode #13

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
73 changes: 22 additions & 51 deletions src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,40 +537,22 @@ private abstract static class AbstractTLSContext extends SSLContextImpl {
private static final List<CipherSuite> serverDefaultCipherSuites;

static {
if (SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
.isSystemFipsEnabled()) {
// RH1860986: TLSv1.3 key derivation not supported with
// the Security Providers available in system FIPS mode.
supportedProtocols = Arrays.asList(
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10
);

serverDefaultProtocols = getAvailableProtocols(
new ProtocolVersion[] {
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10
});
} else {
supportedProtocols = Arrays.asList(
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10,
ProtocolVersion.SSL30,
ProtocolVersion.SSL20Hello
);

serverDefaultProtocols = getAvailableProtocols(
new ProtocolVersion[] {
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10
});
}
supportedProtocols = Arrays.asList(
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10,
ProtocolVersion.SSL30,
ProtocolVersion.SSL20Hello
);

serverDefaultProtocols = getAvailableProtocols(
new ProtocolVersion[] {
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10
});

supportedCipherSuites = getApplicableSupportedCipherSuites(
supportedProtocols);
Expand Down Expand Up @@ -861,23 +843,12 @@ private static List<ProtocolVersion> customizedProtocols(
ProtocolVersion[] candidates;
if (refactored.isEmpty()) {
// Client and server use the same default protocols.
if (SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
.isSystemFipsEnabled()) {
// RH1860986: TLSv1.3 key derivation not supported with
// the Security Providers available in system FIPS mode.
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10
};
} else {
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10
};
}
candidates = new ProtocolVersion[] {
ProtocolVersion.TLS13,
ProtocolVersion.TLS12,
ProtocolVersion.TLS11,
ProtocolVersion.TLS10
};
} else {
// Use the customized TLS protocols.
candidates =
Expand Down
11 changes: 2 additions & 9 deletions src/java.base/share/classes/sun/security/ssl/SunJSSE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@

import java.security.*;
import java.util.*;

import jdk.internal.access.SharedSecrets;
import static sun.security.util.SecurityConstants.PROVIDER_VER;

/**
Expand Down Expand Up @@ -104,13 +102,8 @@ private void doRegister() {
"sun.security.ssl.SSLContextImpl$TLS11Context", null, null);
ps("SSLContext", "TLSv1.2",
"sun.security.ssl.SSLContextImpl$TLS12Context", null, null);
if (!SharedSecrets.getJavaSecuritySystemConfiguratorAccess()
.isSystemFipsEnabled()) {
// RH1860986: TLSv1.3 key derivation not supported with
// the Security Providers available in system FIPS mode.
ps("SSLContext", "TLSv1.3",
"sun.security.ssl.SSLContextImpl$TLS13Context", null, null);
}
ps("SSLContext", "TLSv1.3",
"sun.security.ssl.SSLContextImpl$TLS13Context", null, null);
ps("SSLContext", "TLS",
"sun.security.ssl.SSLContextImpl$TLSContext",
List.of("SSL"), null);
Expand Down