--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java Fri Dec 01 16:40:08 2017 -0500
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java Fri Dec 08 16:41:30 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -91,6 +91,7 @@
private byte compressionMethod;
private CipherSuite cipherSuite;
private SecretKey masterSecret;
+ private final boolean useExtendedMasterSecret;
/*
* Information not part of the SSLv3 protocol spec, but used
@@ -148,7 +149,7 @@
*/
private SSLSessionImpl() {
this(ProtocolVersion.NONE, CipherSuite.C_NULL, null,
- new SessionId(false, null), null, -1);
+ new SessionId(false, null), null, -1, false);
}
/*
@@ -158,9 +159,11 @@
*/
SSLSessionImpl(ProtocolVersion protocolVersion, CipherSuite cipherSuite,
Collection<SignatureAndHashAlgorithm> algorithms,
- SecureRandom generator, String host, int port) {
+ SecureRandom generator, String host, int port,
+ boolean useExtendedMasterSecret) {
this(protocolVersion, cipherSuite, algorithms,
- new SessionId(defaultRejoinable, generator), host, port);
+ new SessionId(defaultRejoinable, generator), host, port,
+ useExtendedMasterSecret);
}
/*
@@ -168,7 +171,8 @@
*/
SSLSessionImpl(ProtocolVersion protocolVersion, CipherSuite cipherSuite,
Collection<SignatureAndHashAlgorithm> algorithms,
- SessionId id, String host, int port) {
+ SessionId id, String host, int port,
+ boolean useExtendedMasterSecret) {
this.protocolVersion = protocolVersion;
sessionId = id;
peerCerts = null;
@@ -182,6 +186,7 @@
SignatureAndHashAlgorithm.getAlgorithmNames(algorithms);
negotiatedMaxFragLen = -1;
statusResponses = null;
+ this.useExtendedMasterSecret = useExtendedMasterSecret;
if (debug != null && Debug.isOn("session")) {
System.out.println("%% Initialized: " + this);
@@ -203,6 +208,10 @@
return masterSecret;
}
+ boolean getUseExtendedMasterSecret() {
+ return useExtendedMasterSecret;
+ }
+
void setPeerCertificates(X509Certificate[] peer) {
if (peerCerts == null) {
peerCerts = peer;