Skip to content
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

Disable TLS 1.0 and TLS 1.1 by default #25279

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Disable TLS 1.0 and TLS 1.1 by default #25279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d5d914
Disable TLS 1.0 and TLS 1.1 by default
kaido207 Dec 10, 2024
64e48d3
Fix ssl config test
kaido207 Dec 10, 2024
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: 3 additions & 3 deletions appserver/admingui/web/src/main/help/en/help/ref-protocolssledit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2023 Contributors to the Eclipse Foundation
Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -31,11 +31,11 @@ <h4><a id="sthref148" name="sthref148"></a><a id="sthref149" name="sthref149"></
</dd>
<dt>TLS1.0</dt>
<dd>
<p>If this checkbox is selected, the TLS1.0 protocol is enabled for the protocol. This option is enabled by default.</p>
<p>If this checkbox is selected, the TLS1.0 protocol is enabled for the protocol. This option is not enabled by default.</p>
</dd>
<dt>TLS1.1</dt>
<dd>
<p>If this checkbox is selected, the TLS1.1 protocol is enabled for the protocol. This option is enabled by default.</p>
<p>If this checkbox is selected, the TLS1.1 protocol is enabled for the protocol. This option is not enabled by default.</p>
</dd>
<dt>TLS1.2</dt>
<dd>
Expand Down
6 changes: 3 additions & 3 deletions appserver/admingui/web/src/main/help/en/help/task-protocolssledit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2023 Contributors to the Eclipse Foundation
Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -44,11 +44,11 @@ <h5>Before You Begin</h5>
</li>
<li>
<p>Select the TLS1.0 Enabled checkbox to enable Transport Layer Security 1.0(TLS1.0).</p>
<p>This option is enabled by default.</p>
<p>This option is not enabled by default.</p>
</li>
<li>
<p>Select the TLS1.1 Enabled checkbox to enable Transport Layer Security 1.1(TLS1.1).</p>
<p>This option is enabled by default.</p>
<p>This option is not enabled by default.</p>
</li>
<li>
<p>Select the TLS1.2 Enabled checkbox to enable Transport Layer Security 1.2(TLS1.2).</p>
Expand Down
7 changes: 5 additions & 2 deletions ...us/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/Ssl2EnabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021 Contributors to the Eclipse Foundation
* Copyright (c) 2021, 2024 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
Expand Down Expand Up @@ -69,7 +69,10 @@ public void sslEnabledTest() {
assertNotNull(ssl);
assertFalse(Boolean.parseBoolean(ssl.getSsl2Enabled()));
assertFalse(Boolean.parseBoolean(ssl.getSsl3Enabled()));
assertTrue(Boolean.parseBoolean(ssl.getTlsEnabled()));
assertFalse(Boolean.parseBoolean(ssl.getTlsEnabled()));
assertFalse(Boolean.parseBoolean(ssl.getTls11Enabled()));
assertTrue(Boolean.parseBoolean(ssl.getTls12Enabled()));
assertTrue(Boolean.parseBoolean(ssl.getTls13Enabled()));
},
() -> {
NetworkListener listener = listeners.get(2);
Expand Down
6 changes: 3 additions & 3 deletions nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Ssl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
* Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
* Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -38,9 +38,9 @@ public interface Ssl extends ConfigBeanProxy, PropertyBag {

boolean SSL3_ENABLED = false;

boolean TLS_ENABLED = true;
boolean TLS_ENABLED = false;

boolean TLS11_ENABLED = true;
boolean TLS11_ENABLED = false;

boolean TLS12_ENABLED = true;

Expand Down