--- a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java Mon Aug 12 23:37:48 2019 +0200
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java Mon Aug 12 21:36:29 2019 -0700
@@ -46,8 +46,8 @@
import javax.net.ssl.SNIServerName;
import javax.net.ssl.SSLHandshakeException;
import javax.security.auth.x500.X500Principal;
-import sun.security.ssl.NamedGroup.NamedGroupType;
-import static sun.security.ssl.NamedGroup.NamedGroupType.*;
+import sun.security.ssl.NamedGroup.NamedGroupSpec;
+import static sun.security.ssl.NamedGroup.NamedGroupSpec.*;
import sun.security.ssl.SupportedGroupsExtension.SupportedGroups;
abstract class HandshakeContext implements ConnectionContext {
@@ -283,8 +283,8 @@
}
boolean found = false;
- Map<NamedGroupType, Boolean> cachedStatus =
- new EnumMap<>(NamedGroupType.class);
+ Map<NamedGroupSpec, Boolean> cachedStatus =
+ new EnumMap<>(NamedGroupSpec.class);
for (CipherSuite suite : enabledCipherSuites) {
if (suite.isAvailable() && suite.supports(protocol)) {
if (isActivatable(suite,
@@ -323,8 +323,8 @@
List<CipherSuite> suites = new LinkedList<>();
if (enabledProtocols != null && !enabledProtocols.isEmpty()) {
- Map<NamedGroupType, Boolean> cachedStatus =
- new EnumMap<>(NamedGroupType.class);
+ Map<NamedGroupSpec, Boolean> cachedStatus =
+ new EnumMap<>(NamedGroupSpec.class);
for (CipherSuite suite : enabledCipherSuites) {
if (!suite.isAvailable()) {
continue;
@@ -509,7 +509,7 @@
private static boolean isActivatable(CipherSuite suite,
AlgorithmConstraints algorithmConstraints,
- Map<NamedGroupType, Boolean> cachedStatus) {
+ Map<NamedGroupSpec, Boolean> cachedStatus) {
if (algorithmConstraints.permits(
EnumSet.of(CryptoPrimitive.KEY_AGREEMENT), suite.name, null)) {
@@ -520,8 +520,8 @@
// Is at least one of the group types available?
boolean groupAvailable, retval = false;
- NamedGroupType[] groupTypes = suite.keyExchange.groupTypes;
- for (NamedGroupType groupType : groupTypes) {
+ NamedGroupSpec[] groupTypes = suite.keyExchange.groupTypes;
+ for (NamedGroupSpec groupType : groupTypes) {
if (groupType != NAMED_GROUP_NONE) {
Boolean checkedStatus = cachedStatus.get(groupType);
if (checkedStatus == null) {