Fix #23650 SSLHandshakeException occured when execute start-domain after enable-secure-admin
Signed-off-by: 11rx4f <ryosuke.okada@fujitsu.com>
diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java
index c35930e..a4a47a4 100644
--- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java
+++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -402,6 +403,15 @@
if (sslParams.getTlsEnabled()) {
tmpSSLArtifactsList.add("TLSv1");
}
+ if (sslParams.getTls11Enabled()) {
+ tmpSSLArtifactsList.add("TLSv1.1");
+ }
+ if (sslParams.getTls12Enabled()) {
+ tmpSSLArtifactsList.add("TLSv1.2");
+ }
+ if (sslParams.getTls13Enabled()) {
+ tmpSSLArtifactsList.add("TLSv1.3");
+ }
if (sslParams.getSsl3Enabled() || sslParams.getTlsEnabled()) {
tmpSSLArtifactsList.add("SSLv2Hello");
}
diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLParams.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLParams.java
index fd09c7d..1bcdcb7 100644
--- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLParams.java
+++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLParams.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -61,6 +62,9 @@
private Boolean ssl3Enabled = true;
private String ssl3TlsCiphers;
private Boolean tlsEnabled=true;
+ private Boolean tls11Enabled=true;
+ private Boolean tls12Enabled=true;
+ private Boolean tls13Enabled=true;
private Boolean tlsRollBackEnabled=false;
@@ -295,10 +299,33 @@
return tlsEnabled;
}
+ public Boolean getTls11Enabled() {
+ return tls11Enabled;
+ }
+
+ public Boolean getTls12Enabled() {
+ return tls12Enabled;
+ }
+
+ public Boolean getTls13Enabled() {
+ return tls13Enabled;
+ }
+
public void setTlsEnabled(String tlsEnabled) {
this.tlsEnabled = Boolean.parseBoolean(tlsEnabled);
}
+ public void setTls11Enabled(String tls11Enabled) {
+ this.tls11Enabled = Boolean.parseBoolean(tls11Enabled);
+ }
+
+ public void setTls12Enabled(String tls12Enabled) {
+ this.tls12Enabled = Boolean.parseBoolean(tls12Enabled);
+ }
+
+ public void setTls13Enabled(String tls13Enabled) {
+ this.tls13Enabled = Boolean.parseBoolean(tls13Enabled);
+ }
/**
* Determines whether TLS rollback is enabled. TLS rollback should be enabled for Microsoft Internet Explorer 5.0
