Merge branch 'master' into sidolfreiburgadjustments

tls-attacker · Feb 21, 2019 · 8f3edc0 · 8f3edc0
2 parents 42ac7d1 + a549afd
commit 8f3edc0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/LongPaddingGenerator.java b/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/LongPaddingGenerator.java
@@ -99,7 +99,7 @@ List<PaddingVector> createMissingMacByteVectors(CipherSuite suite, ProtocolVersi
     List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
         List<PaddingVector> vectorList = new LinkedList<>();
         byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
-        vectorList.add(createVectorWithPlainData("Plain FF", plain));
+        vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
         plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (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
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, };
-        vectorList.add(createVectorWithPlainData("Plain 4F", plain));
+        vectorList.add(createVectorWithPlainData("Plain FF", plain));
         return vectorList;
     }
 

diff --git a/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/MediumPaddingGenerator.java b/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/MediumPaddingGenerator.java
@@ -100,7 +100,7 @@ List<PaddingVector> createMissingMacByteVectors(CipherSuite suite, ProtocolVersi
     List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
         List<PaddingVector> vectorList = new LinkedList<>();
         byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
-        vectorList.add(createVectorWithPlainData("Plain FF", plain));
+        vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
         plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (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
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, };
-        vectorList.add(createVectorWithPlainData("Plain 4F", plain));
+        vectorList.add(createVectorWithPlainData("Plain FF", plain));
         return vectorList;
     }
 

diff --git a/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/ShortPaddingGenerator.java b/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/ShortPaddingGenerator.java
@@ -101,7 +101,7 @@ List<PaddingVector> createMissingMacByteVectors(CipherSuite suite, ProtocolVersi
     List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
         List<PaddingVector> vectorList = new LinkedList<>();
         byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
-        vectorList.add(createVectorWithPlainData("Plain FF", plain));
+        vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
         plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (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
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, };
-        vectorList.add(createVectorWithPlainData("Plain 4F", plain));
+        vectorList.add(createVectorWithPlainData("Plain FF", plain));
         return vectorList;
     }
 

diff --git a/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/VeryShortPaddingGenerator.java b/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/padding/VeryShortPaddingGenerator.java
@@ -53,7 +53,7 @@ public List<PaddingVector> getVectors(CipherSuite suite, ProtocolVersion version
     List<PaddingVector> createOnlyPaddingVectors(CipherSuite suite, ProtocolVersion version) {
         List<PaddingVector> vectorList = new LinkedList<>();
         byte[] plain = createPaddingBytes(DEFAULT_CIPHERTEXT_LENGTH - 1);
-        vectorList.add(createVectorWithPlainData("Plain FF", plain));
+        vectorList.add(createVectorWithPlainData("Plain XF (0xXF=#padding bytes)", plain));
         plain = new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (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
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255,
                 (byte) 255, };
-        vectorList.add(createVectorWithPlainData("Plain 4F", plain));
+        vectorList.add(createVectorWithPlainData("Plain FF", plain));
         return vectorList;
     }