archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8207009: TLS 1.3 half-close and synchronization issues

Browse source 
Reviewed-by: jnimeh, mullan, wetmore
This commit is contained in:
Xue-Lei Andrew Fan 2018-08-14 18:16:47 -07:00
parent d8ce7f36e2
commit 611c53c860
36 changed files with 1467 additions and 621 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
View file

@ -204,30 +204,35 @@ abstract class BaseSSLSocketImpl extends SSLSocket {
//
/**
* The semantics of shutdownInput is not supported in TLS 1.0
* spec. Thus when the method is called on an SSL socket, an
* UnsupportedOperationException will be thrown.
* Places the input stream for this socket at "end of stream". Any data
* sent to the input stream side of the socket is acknowledged and then
* silently discarded.
*
* @throws UnsupportedOperationException
* @see java.net.Socket#shutdownInput
*/
@Override
public final void shutdownInput() throws IOException {
throw new UnsupportedOperationException("The method shutdownInput()" +
" is not supported in SSLSocket");
public void shutdownInput() throws IOException {
if (self == this) {
super.shutdownInput();
} else {
self.shutdownInput();
}
}
/**
* The semantics of shutdownOutput is not supported in TLS 1.0
* spec. Thus when the method is called on an SSL socket, an
* UnsupportedOperationException will be thrown.
* Disables the output stream for this socket. For a TCP socket, any
* previously written data will be sent followed by TCP's normal
* connection termination sequence.
*
* @throws UnsupportedOperationException
* @see java.net.Socket#shutdownOutput
*/
@Override
public final void shutdownOutput() throws IOException {
throw new UnsupportedOperationException("The method shutdownOutput()" +
" is not supported in SSLSocket");
public void shutdownOutput() throws IOException {
if (self == this) {
super.shutdownOutput();
} else {
self.shutdownOutput();
}
}
/**
@ -235,7 +240,7 @@ abstract class BaseSSLSocketImpl extends SSLSocket {
* @see java.net.Socket#isInputShutdown
*/
@Override
public final boolean isInputShutdown() {
public boolean isInputShutdown() {
if (self == this) {
return super.isInputShutdown();
} else {
@ -248,7 +253,7 @@ abstract class BaseSSLSocketImpl extends SSLSocket {
* @see java.net.Socket#isOutputShutdown
*/
@Override
public final boolean isOutputShutdown() {
public boolean isOutputShutdown() {
if (self == this) {
return super.isOutputShutdown();
} else {
@ -618,7 +623,7 @@ abstract class BaseSSLSocketImpl extends SSLSocket {
}
@Override
public synchronized void close() throws IOException {
public void close() throws IOException {
if (self == this) {
super.close();
} else {