Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8233619: SSLEngine handshake status immediately after the handshake c…
…an be NOT_HANDSHAKING rather than FINISHED with TLSv1.3

Reviewed-by: jnimeh
  • Loading branch information
XueleiFan committed Mar 3, 2020
1 parent 467ee78 commit 89448a83d9af6a74756bf8d77218468409d26925
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020, 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
@@ -1140,8 +1140,8 @@ private void onConsumeFinished(ServerHandshakeContext shc,
SSLLogger.fine(
"Sending new session ticket");
}
NewSessionTicket.kickstartProducer.produce(shc);

NewSessionTicket.kickstartProducer.produce(shc);
}
}

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, 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
@@ -429,8 +429,8 @@ public byte[] produce(ConnectionContext context) throws IOException {
hc.handshakeOutput.flush();
}

if (hc instanceof PostHandshakeContext) {
((PostHandshakeContext) hc).finish();
if (hc.negotiatedProtocol.useTLS13PlusSpec()) {
hc.conContext.finishPostHandshake();
}

// The message has been delivered.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, 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
@@ -83,9 +83,4 @@ void dispatch(byte handshakeType, ByteBuffer fragment) throws IOException {
SSLHandshake.nameOf(handshakeType), be);
}
}

// Finish this PostHandshake event
void finish() {
handshakeSession = null;
}
}

0 comments on commit 89448a8

Please sign in to comment.