Skip to content

8350830: Values converted incorrectly when reading TLS session tickets #24535

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

Closed
wants to merge 3 commits into from
Closed

8350830: Values converted incorrectly when reading TLS session tickets #24535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81ea059
8350830: Values converted incorrectly when reading TLS session tickets
nibjen Apr 9, 2025
46d4a6e
Minor change
nibjen Apr 9, 2025
9e0e0bc
Updated SSLSessionImpl constructor with Record interface methods
nibjen Apr 14, 2025
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
100 changes: 35 additions & 65 deletions src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.math.BigInteger;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
Expand Down Expand Up @@ -311,113 +312,90 @@ final class SSLSessionImpl extends ExtendedSSLSession {
SSLSessionImpl(HandshakeContext hc, ByteBuffer buf) throws IOException {
boundValues = new ConcurrentHashMap<>();
this.protocolVersion =
ProtocolVersion.valueOf(Short.toUnsignedInt(buf.getShort()));
ProtocolVersion.valueOf(Record.getInt16(buf));

// The CH session id may reset this if it's provided
this.sessionId = new SessionId(true,
hc.sslContext.getSecureRandom());

this.cipherSuite =
CipherSuite.valueOf(Short.toUnsignedInt(buf.getShort()));
CipherSuite.valueOf(Record.getInt16(buf));

// Local Supported signature algorithms
ArrayList<SignatureScheme> list = new ArrayList<>();
int i = Byte.toUnsignedInt(buf.get());
int i = Record.getInt8(buf);
while (i-- > 0) {
list.add(SignatureScheme.valueOf(
Short.toUnsignedInt(buf.getShort())));
Record.getInt16(buf)));
}
this.localSupportedSignAlgs = Collections.unmodifiableCollection(list);

// Peer Supported signature algorithms
i = Byte.toUnsignedInt(buf.get());
i = Record.getInt8(buf);
list.clear();
while (i-- > 0) {
list.add(SignatureScheme.valueOf(
Short.toUnsignedInt(buf.getShort())));
Record.getInt16(buf)));
}
this.peerSupportedSignAlgs = Collections.unmodifiableCollection(list);

// PSK
byte[] b;
i = Short.toUnsignedInt(buf.getShort());
if (i > 0) {
b = new byte[i];
// Get algorithm string
buf.get(b, 0, i);
// Encoded length
i = Short.toUnsignedInt(buf.getShort());
// Encoded SecretKey
b = new byte[i];
buf.get(b);
byte[] b = Record.getBytes16(buf);
if (b.length > 0) {
b = Record.getBytes16(buf);
this.preSharedKey = new SecretKeySpec(b, "TlsMasterSecret");
} else {
this.preSharedKey = null;
}

// PSK identity
i = buf.get();
if (i > 0) {
b = new byte[i];
buf.get(b);
b = Record.getBytes8(buf);
if (b.length > 0) {
this.pskIdentity = b;
} else {
this.pskIdentity = null;
}

// Master secret length of secret key algorithm (one byte)
i = buf.get();
if (i > 0) {
b = new byte[i];
// Get algorithm string
buf.get(b, 0, i);
// Encoded length
i = Short.toUnsignedInt(buf.getShort());
// Encoded SecretKey
b = new byte[i];
buf.get(b);
b = Record.getBytes8(buf);
if (b.length > 0) {
b = Record.getBytes16(buf);
this.masterSecret = new SecretKeySpec(b, "TlsMasterSecret");
} else {
this.masterSecret = null;
}

// Use extended master secret
this.useExtendedMasterSecret = (buf.get() != 0);
this.useExtendedMasterSecret = (Record.getInt8(buf) != 0);

// Identification Protocol
i = buf.get();
if (i == 0) {
b = Record.getBytes8(buf);
if (b.length == 0) {
identificationProtocol = null;
} else {
b = new byte[i];
buf.get(b);
identificationProtocol = new String(b);
}

// SNI
i = buf.get(); // length
if (i == 0) {
b = Record.getBytes8(buf);
if (b.length == 0) {
serverNameIndication = null;
} else {
b = new byte[i];
buf.get(b, 0, b.length);
serverNameIndication = new SNIHostName(b);
}

// List of SNIServerName
int len = Short.toUnsignedInt(buf.getShort());
int len = Record.getInt16(buf);
if (len == 0) {
this.requestedServerNames = Collections.emptyList();
} else {
requestedServerNames = new ArrayList<>();
while (len > 0) {
int l = buf.get();
b = new byte[l];
buf.get(b, 0, l);
b = Record.getBytes8(buf);
requestedServerNames.add(new SNIHostName(new String(b)));
len--;
}
}

maximumPacketSize = buf.getInt();
negotiatedMaxFragLen = buf.getInt();

Expand All @@ -427,31 +405,28 @@ final class SSLSessionImpl extends ExtendedSSLSession {
// Get Buffer sizes

// Status Response
len = Short.toUnsignedInt(buf.getShort());
len = Record.getInt16(buf);
if (len == 0) {
statusResponses = Collections.emptyList();
} else {
statusResponses = new ArrayList<>();
}
while (len-- > 0) {
b = new byte[Short.toUnsignedInt(buf.getShort())];
buf.get(b);
b = Record.getBytes16(buf);
statusResponses.add(b);
}

// Get Peer host & port
i = Byte.toUnsignedInt(buf.get());
if (i == 0) {
b = Record.getBytes8(buf);
if (b.length == 0) {
this.host = "";
} else {
b = new byte[i];
buf.get(b, 0, i);
this.host = new String(b);
}
this.port = Short.toUnsignedInt(buf.getShort());
this.port = Record.getInt16(buf);

// Peer certs
i = buf.get();
i = Record.getInt8(buf);
if (i == 0) {
this.peerCerts = null;
} else {
Expand All @@ -470,7 +445,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
}

// Get local certs of PSK
switch (buf.get()) {
switch (Record.getInt8(buf)) {
case 0:
break;
case 1:
Expand All @@ -492,21 +467,15 @@ final class SSLSessionImpl extends ExtendedSSLSession {
case 2:
// pre-shared key
// Length of pre-shared key algorithm (one byte)
i = buf.get();
b = new byte[i];
buf.get(b, 0, i);
b = Record.getBytes8(buf);
String alg = new String(b);
// Get length of encoding
i = Short.toUnsignedInt(buf.getShort());
// Get encoding
b = new byte[i];
buf.get(b);
b = Record.getBytes16(buf);
this.preSharedKey = new SecretKeySpec(b, alg);
// Get identity len
i = buf.get();
i = Record.getInt8(buf);
if (i > 0) {
this.pskIdentity = new byte[buf.get()];
buf.get(pskIdentity);
this.pskIdentity = Record.getBytes8(buf);
} else {
this.pskIdentity = null;
}
Expand All @@ -520,6 +489,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
this.lastUsedTime = System.currentTimeMillis();
}


// Some situations we cannot provide a stateless ticket, but after it
// has been negotiated
boolean isStatelessable() {
Expand Down
Loading