Skip to content

Commit 002bcf9

Browse files
committed
Moved PSK ext in ClientHello to make sure it's the last extension
1 parent 74885a5 commit 002bcf9

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/ClientHelloMessage.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@ public ClientHelloMessage(Config tlsConfig) {
131131
if (tlsConfig.isAddPSKKeyExchangeModesExtension()) {
132132
addExtension(new PSKKeyExchangeModesExtensionMessage(tlsConfig));
133133
}
134-
if (tlsConfig.isAddPreSharedKeyExtension()) {
135-
addExtension(new PreSharedKeyExtensionMessage(tlsConfig));
136-
}
137134
if (tlsConfig.isAddExtendedMasterSecretExtension()) {
138135
addExtension(new ExtendedMasterSecretExtensionMessage());
139136
}
@@ -200,6 +197,10 @@ public ClientHelloMessage(Config tlsConfig) {
200197
if (tlsConfig.isAddCertificateStatusRequestV2Extension()) {
201198
addExtension(new CertificateStatusRequestV2ExtensionMessage());
202199
}
200+
if (tlsConfig.isAddPreSharedKeyExtension()) {
201+
addExtension(new PreSharedKeyExtensionMessage(tlsConfig));
202+
}
203+
//In TLS 1.3, the PSK ext has to be the last ClientHello extension
203204
}
204205

205206
public ModifiableInteger getCompressionLength() {

0 commit comments

Comments
 (0)