Skip to content

Commit 7cc303f

Browse files
ic0nsic0ns
authored
Merge branch 'master' into paddingrelease
2 parents 444101d + fa188a6 commit 7cc303f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/LongPaddingGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ List<PaddingVector> createMissingMacByteVectors(CipherSuite suite, ProtocolVersi
9999
List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
100100
List<PaddingVector> vectorList = new LinkedList<>();
101101
byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
102-
vectorList.add(createVectorWithPlainData("Plain FF", plain));
102+
vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
103103
plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
104104
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
105105
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
@@ -111,7 +111,7 @@ List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion
111111
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
112112
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
113113
(byte) 255, };
114-
vectorList.add(createVectorWithPlainData("Plain 4F", plain));
114+
vectorList.add(createVectorWithPlainData("Plain FF", plain));
115115
return vectorList;
116116
}
117117

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/MediumPaddingGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ List<PaddingVector> createMissingMacByteVectors(CipherSuite suite, ProtocolVersi
100100
List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
101101
List<PaddingVector> vectorList = new LinkedList<>();
102102
byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
103-
vectorList.add(createVectorWithPlainData("Plain FF", plain));
103+
vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
104104
plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
105105
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
106106
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
@@ -112,7 +112,7 @@ List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion
112112
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
113113
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
114114
(byte) 255, };
115-
vectorList.add(createVectorWithPlainData("Plain 4F", plain));
115+
vectorList.add(createVectorWithPlainData("Plain FF", plain));
116116
return vectorList;
117117
}
118118

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/ShortPaddingGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ List<PaddingVector> createMissingMacByteVectors(CipherSuite suite, ProtocolVersi
101101
List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
102102
List<PaddingVector> vectorList = new LinkedList<>();
103103
byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
104-
vectorList.add(createVectorWithPlainData("Plain FF", plain));
104+
vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
105105
plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
106106
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
107107
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
@@ -113,7 +113,7 @@ List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion
113113
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
114114
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
115115
(byte) 255, };
116-
vectorList.add(createVectorWithPlainData("Plain 4F", plain));
116+
vectorList.add(createVectorWithPlainData("Plain FF", plain));
117117
return vectorList;
118118
}
119119

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/VeryShortPaddingGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public List<PaddingVector> getVectors(CipherSuite suite, ProtocolVersion version
5353
List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
5454
List<PaddingVector> vectorList = new LinkedList<>();
5555
byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
56-
vectorList.add(createVectorWithPlainData("Plain FF", plain));
56+
vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
5757
plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
5858
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
5959
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
@@ -65,7 +65,7 @@ List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion
6565
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
6666
(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
6767
(byte) 255, };
68-
vectorList.add(createVectorWithPlainData("Plain 4F", plain));
68+
vectorList.add(createVectorWithPlainData("Plain FF", plain));
6969
return vectorList;
7070
}
7171

0 commit comments

Comments
 (0)