Skip to content

Commit e3692ee

Browse files
committed
Clarify dependency b/w getSessionToResume and getCipherSuites
1 parent 5184b26 commit e3692ee

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tls/src/main/java/org/bouncycastle/tls/DTLSClientProtocol.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,11 @@ protected byte[] generateClientHello(ClientHandshakeState state)
420420

421421
TlsSession sessionToResume = offeringDTLSv12Minus ? client.getSessionToResume() : null;
422422

423-
boolean fallback = client.isFallback();
424-
423+
// NOTE: Client is free to modify the cipher suites up until getSessionToResume
425424
state.offeredCipherSuites = client.getCipherSuites();
426425

426+
boolean fallback = client.isFallback();
427+
427428
state.clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(client.getClientExtensions());
428429

429430
final boolean shouldUseEMS = client.shouldUseExtendedMasterSecret();

tls/src/main/java/org/bouncycastle/tls/TlsClientProtocol.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,10 +1808,11 @@ protected void sendClientHello()
18081808

18091809
TlsSession sessionToResume = offeringTLSv12Minus ? tlsClient.getSessionToResume() : null;
18101810

1811-
boolean fallback = tlsClient.isFallback();
1812-
1811+
// NOTE: Client is free to modify the cipher suites up until getSessionToResume
18131812
int[] offeredCipherSuites = tlsClient.getCipherSuites();
18141813

1814+
boolean fallback = tlsClient.isFallback();
1815+
18151816
this.clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(tlsClient.getClientExtensions());
18161817

18171818
final boolean shouldUseEMS = tlsClient.shouldUseExtendedMasterSecret();

0 commit comments

Comments
 (0)