infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8367133: DTLS: fragmentation of Finished message results in handshake failure

Browse Source 
Reviewed-by: jnimeh
This commit is contained in:
Daniel Jeliński 2025-09-25 18:17:19 +00:00
parent 5c596e2a95
commit 80cb0ead50
2 changed files with 78 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -801,8 +801,11 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
// buffer this fragment
if (hsf.handshakeType == SSLHandshake.FINISHED.id) {
// Need no status update.
bufferedFragments.add(hsf);
// Make sure it's not a retransmitted message
if (hsf.recordEpoch > handshakeEpoch) {
bufferedFragments.add(hsf);
flightIsReady = holes.isEmpty();
}
} else {
bufferFragment(hsf);
}

72
test/jdk/javax/net/ssl/DTLS/FragmentedFinished.java Normal file
View File

@ -0,0 +1,72 @@
/*
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
/*
* @test
* @bug 8367133
* @summary Verify that handshake succeeds when Finished message is fragmented
* @modules java.base/sun.security.util
* @library /test/lib
* @build DTLSOverDatagram
* @run main/othervm FragmentedFinished
*/
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import java.net.DatagramPacket;
import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.List;
public class FragmentedFinished extends DTLSOverDatagram {
private SSLEngine serverSSLEngine;
public static void main(String[] args) throws Exception {
FragmentedFinished testCase = new FragmentedFinished();
testCase.runTest(testCase);
}
@Override
SSLEngine createSSLEngine(boolean isClient) throws Exception {
SSLEngine sslEngine = super.createSSLEngine(isClient);
if (!isClient) {
serverSSLEngine = sslEngine;
}
return sslEngine;
}
@Override
DatagramPacket createHandshakePacket(byte[] ba, SocketAddress socketAddr) {
if (ba.length < 30) { // detect ChangeCipherSpec
// Reduce the maximumPacketSize to force fragmentation
// of the Finished message
SSLParameters params = serverSSLEngine.getSSLParameters();
params.setMaximumPacketSize(53);
serverSSLEngine.setSSLParameters(params);
}
return super.createHandshakePacket(ba, socketAddr);
}
}