Skip to content

Commit b7d5f4c

Browse files
c-southwestc-southwest
committed
fix: PionDTLS-2-0-9_Client_psk regression test
1 parent 2ce38d4 commit b7d5f4c

File tree

1 file changed

+35
-15
lines changed

1 file changed

+35
-15
lines changed

‎experiments/patches/TLS-Attacker-v6.3.3.patch

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/dtls/FragmentManager.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/dtls/FragmentManager.java
2-
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/dtls/FragmentManager.java 2025-02-08 16:56:41.298359978 +0100
3-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/dtls/FragmentManager.java 2025-02-08 02:35:10.080387775 +0100
2+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/dtls/FragmentManager.java 2025-02-18 15:27:19.852092651 +0100
3+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/dtls/FragmentManager.java 2025-02-17 17:45:43.036593112 +0100
44
@@ -23,7 +23,6 @@
55

66
private Map<FragmentKey, FragmentCollector> fragments;
@@ -53,8 +53,8 @@ diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/dtls/F
5353
}
5454
}
5555
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/LayerStackFactory.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/LayerStackFactory.java
56-
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/LayerStackFactory.java 2025-02-06 01:00:52.196179597 +0100
57-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/LayerStackFactory.java 2025-02-11 13:39:58.499641217 +0100
56+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/LayerStackFactory.java 2025-02-18 15:27:19.852092651 +0100
57+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/LayerStackFactory.java 2025-02-17 17:45:43.036593112 +0100
5858
@@ -32,7 +32,7 @@
5959
new MessageLayer(context),
6060
new DtlsFragmentLayer(context),
@@ -65,8 +65,8 @@ diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/
6565
return new LayerStack(
6666
context,
6767
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/context/TlsContext.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/context/TlsContext.java
68-
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/context/TlsContext.java 2025-02-08 02:29:25.443282294 +0100
69-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/context/TlsContext.java 2025-02-08 17:31:48.355691568 +0100
68+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/context/TlsContext.java 2025-02-18 15:27:19.852092651 +0100
69+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/context/TlsContext.java 2025-02-17 17:45:43.036593112 +0100
7070
@@ -60,6 +60,7 @@
7171
import de.rub.nds.tlsattacker.core.state.session.TicketSession;
7272
import de.rub.nds.tlsattacker.core.workflow.chooser.Chooser;
@@ -146,7 +146,7 @@ diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/
146146
return this.clientSupportedSrtpProtectionProfiles;
147147
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/FirstCachedUdpLayer.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/FirstCachedUdpLayer.java
148148
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/FirstCachedUdpLayer.java 1970-01-01 01:00:00.000000000 +0100
149-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/FirstCachedUdpLayer.java 2025-02-11 14:55:54.898535062 +0100
149+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/FirstCachedUdpLayer.java 2025-02-17 17:45:43.036593112 +0100
150150
@@ -0,0 +1,64 @@
151151
+/*
152152
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
@@ -213,8 +213,8 @@ diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/
213213
+ }
214214
+}
215215
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/UdpLayer.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/UdpLayer.java
216-
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/UdpLayer.java 2025-02-06 01:00:52.196179597 +0100
217-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/UdpLayer.java 2025-02-11 11:48:34.040163959 +0100
216+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/UdpLayer.java 2025-02-18 15:27:19.852092651 +0100
217+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/impl/UdpLayer.java 2025-02-17 17:45:43.036593112 +0100
218218
@@ -26,7 +26,7 @@
219219
*/
220220
public class UdpLayer extends ProtocolLayer<LayerProcessingHint, UdpDataPacket> {
@@ -234,8 +234,8 @@ diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/layer/
234234
throw new RuntimeException("TransportHandler is not set in context!");
235235
}
236236
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/CertificateMessagePreparator.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/CertificateMessagePreparator.java
237-
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/CertificateMessagePreparator.java 2025-02-08 02:29:25.443282294 +0100
238-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/CertificateMessagePreparator.java 2025-02-08 22:50:18.692731360 +0100
237+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/CertificateMessagePreparator.java 2025-02-18 15:27:19.852092651 +0100
238+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/CertificateMessagePreparator.java 2025-02-17 17:45:43.036593112 +0100
239239
@@ -114,7 +114,8 @@
240240

241241
case X509:
@@ -255,8 +255,8 @@ diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protoc
255255

256256
private void prepareCert(
257257
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/RSAClientKeyExchangePreparator.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/RSAClientKeyExchangePreparator.java
258-
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/RSAClientKeyExchangePreparator.java 2025-02-06 01:00:52.325833970 +0100
259-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/RSAClientKeyExchangePreparator.java 2025-02-13 18:18:34.365445319 +0100
258+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/RSAClientKeyExchangePreparator.java 2025-02-18 15:27:19.852092651 +0100
259+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/RSAClientKeyExchangePreparator.java 2025-02-17 17:45:43.036593112 +0100
260260
@@ -144,7 +144,7 @@
261261
public byte[] decryptPremasterSecret() {
262262
BigInteger bigIntegerEncryptedPremasterSecret =
@@ -266,9 +266,29 @@ diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protoc
266266
if (chooser.getServerX509Chooser().getSubjectRsaModulus().equals(BigInteger.ZERO)) {
267267
LOGGER.warn("RSA modulus is zero, returning new byte[0] as decryptedPremasterSecret");
268268
return new byte[0];
269+
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/record/crypto/RecordDecryptor.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/record/crypto/RecordDecryptor.java
270+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/record/crypto/RecordDecryptor.java 2025-02-18 15:27:19.862061458 +0100
271+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/record/crypto/RecordDecryptor.java 2025-02-18 15:01:49.944933950 +0100
272+
@@ -8,6 +8,7 @@
273+
*/
274+
package de.rub.nds.tlsattacker.core.record.crypto;
275+
276+
+import de.rub.nds.protocol.exception.EndOfStreamException;
277+
import de.rub.nds.protocol.exception.ParserException;
278+
import de.rub.nds.tlsattacker.core.constants.ProtocolMessageType;
279+
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
280+
@@ -55,7 +56,7 @@
281+
|| record.getContentMessageType() != ProtocolMessageType.CHANGE_CIPHER_SPEC) {
282+
try {
283+
recordCipher.decrypt(record);
284+
- } catch (ParserException | CryptoException ex) {
285+
+ } catch (ParserException | CryptoException | EndOfStreamException ex) {
286+
if (recordCipherList.indexOf(recordCipher) > 0) {
287+
LOGGER.warn(
288+
"Failed to decrypt record, will try to process with previous cipher");
269289
diff -ruN TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/Context.java TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/Context.java
270-
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/Context.java 2025-02-08 02:29:25.443282294 +0100
271-
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/Context.java 2025-02-08 00:57:42.272011120 +0100
290+
--- TLS-Attacker/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/Context.java 2025-02-18 15:27:19.862061458 +0100
291+
+++ TLS-Attacker_patched/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/Context.java 2025-02-17 17:45:43.036593112 +0100
272292
@@ -168,7 +168,7 @@
273293
}
274294

0 commit comments

Comments
 (0)