Merge pull request #477 from tls-attacker/release_fix

updated bom version and adjusted code to new modifiable variable version

Author: ic0ns

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/padding/vector/LongPaddingGenerator.java

@@ -10,7 +10,6 @@
 
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayDeleteModification;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayXorModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
 import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
@@ -414,9 +413,6 @@ private List<ByteArrayXorModification> createFlippedModifications(int byteLength
 
     private PaddingVector createVectorWithPlainData(String name, String identifier, byte[] plain) {
         return new PlainPaddingVector(
-                name,
-                identifier,
-                (ByteArrayExplicitValueModification)
-                        ByteArrayModificationFactory.explicitValue(plain));
+                name, identifier, new ByteArrayExplicitValueModification(plain));
     }
 }

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/padding/vector/MediumPaddingGenerator.java

@@ -10,7 +10,6 @@
 
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayDeleteModification;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayXorModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
 import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
@@ -354,9 +353,6 @@ List<ByteArrayXorModification> createFlippedModifications(int byteLength) {
 
     private PaddingVector createVectorWithPlainData(String name, String identifier, byte[] plain) {
         return new PlainPaddingVector(
-                name,
-                identifier,
-                (ByteArrayExplicitValueModification)
-                        ByteArrayModificationFactory.explicitValue(plain));
+                name, identifier, new ByteArrayExplicitValueModification(plain));
     }
 }

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/padding/vector/PlainPaddingVector.java

@@ -30,7 +30,7 @@ public Record createRecord() {
         Record r = new Record();
         r.prepareComputations();
         ModifiableByteArray byteArray = new ModifiableByteArray();
-        byteArray.setModification(modification);
+        byteArray.setModifications(modification);
         r.getComputations().setPlainRecordBytes(byteArray);
         return r;
     }

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/padding/vector/ShortPaddingGenerator.java

@@ -10,7 +10,6 @@
 
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayDeleteModification;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayXorModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
 import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
@@ -340,9 +339,6 @@ List<ByteArrayXorModification> createFlippedModifications(int byteLength) {
 
     private PaddingVector createVectorWithPlainData(String name, String identifier, byte[] plain) {
         return new PlainPaddingVector(
-                name,
-                identifier,
-                (ByteArrayExplicitValueModification)
-                        ByteArrayModificationFactory.explicitValue(plain));
+                name, identifier, new ByteArrayExplicitValueModification(plain));
     }
 }

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/padding/vector/TripleVector.java

@@ -40,13 +40,19 @@ public Record createRecord() {
         Record r = new Record();
         r.prepareComputations();
         ModifiableByteArray byteArray = new ModifiableByteArray();
-        byteArray.setModification(paddingModification);
+        if (paddingModification != null) {
+            byteArray.setModifications(paddingModification);
+        }
         r.getComputations().setPadding(byteArray);
         byteArray = new ModifiableByteArray();
-        byteArray.setModification(cleanModification);
+        if (cleanModification != null) {
+            byteArray.setModifications(cleanModification);
+        }
         r.setCleanProtocolMessageBytes(byteArray);
         byteArray = new ModifiableByteArray();
-        byteArray.setModification(macModification);
+        if (macModification != null) {
+            byteArray.setModifications(macModification);
+        }
         r.getComputations().setMac(byteArray);
         return r;
     }

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/padding/vector/VeryShortPaddingGenerator.java

@@ -9,7 +9,6 @@
 package de.rub.nds.tlsscanner.core.probe.padding.vector;
 
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayXorModification;
 import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
 import de.rub.nds.tlsattacker.core.constants.CipherSuite;
@@ -184,9 +183,6 @@ List<ByteArrayXorModification> createFlippedModifications(int byteLength) {
 
     private PaddingVector createVectorWithPlainData(String name, String identifier, byte[] plain) {
         return new PlainPaddingVector(
-                name,
-                identifier,
-                (ByteArrayExplicitValueModification)
-                        ByteArrayModificationFactory.explicitValue(plain));
+                name, identifier, new ByteArrayExplicitValueModification(plain));
     }
 }

TLS-Scanner-Core/src/test/java/de/rub/nds/tlsscanner/core/probe/padding/vector/ShortPaddingGeneratorTest.java

@@ -62,7 +62,8 @@ public void testCreateBasicMacVectors() {
                         .getMacLength();
         VariableModification modification = ((TripleVector) vectors.get(0)).getCleanModification();
         ModifiableByteArray array = new ModifiableByteArray();
-        array.setModification(modification);
+        array.setOriginalValue(new byte[0]);
+        array.setModifications(modification);
         byte[] expectedPlain =
                 new byte
                         [ShortPaddingGenerator.DEFAULT_CIPHERTEXT_LENGTH
@@ -85,12 +86,14 @@ public void testCreateMissingMacByteVectors() {
                         .getMacLength();
         VariableModification modification = ((TripleVector) vectors.get(0)).getCleanModification();
         ModifiableByteArray array = new ModifiableByteArray();
-        array.setModification(modification);
+        array.setOriginalValue(new byte[0]);
+        array.setModifications(modification);
         assertArrayEquals(new byte[0], array.getValue(), "Validation of clean bytes");
 
         modification = ((TripleVector) vectors.get(0)).getPaddingModification();
         array = new ModifiableByteArray();
-        array.setModification(modification);
+        array.setOriginalValue(new byte[0]);
+        array.setModifications(modification);
         byte[] expectedPadding =
                 generator.createPaddingBytes(
                         ShortPaddingGenerator.DEFAULT_CIPHERTEXT_LENGTH - macSize);
@@ -100,15 +103,15 @@ public void testCreateMissingMacByteVectors() {
         modification = ((TripleVector) vectors.get(0)).getMacModification();
         array = new ModifiableByteArray();
         array.setOriginalValue(macToModify);
-        array.setModification(modification);
+        array.setModifications(modification);
         byte[] expectedMac = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
         assertArrayEquals(
                 expectedMac, array.getValue(), "Validation of the deleted first byte in MAC");
 
         modification = ((TripleVector) vectors.get(1)).getMacModification();
         array = new ModifiableByteArray();
         array.setOriginalValue(macToModify);
-        array.setModification(modification);
+        array.setModifications(modification);
         expectedMac = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18};
         assertArrayEquals(
                 expectedMac, array.getValue(), "Validation of the deleted last byte in MAC");
@@ -487,13 +490,13 @@ public void testCreateFlippedModifications() {
         ModifiableByteArray array = new ModifiableByteArray();
         array.setOriginalValue(new byte[10]);
         byte[] expected = new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
-        array.setModification(modifications.get(0));
+        array.setModifications(modifications.get(0));
         assertArrayEquals(expected, array.getValue(), "Last byte should be xored with 0x01");
         expected = new byte[] {0, 0, 0, 0, 0, 8, 0, 0, 0, 0};
-        array.setModification(modifications.get(1));
+        array.setModifications(modifications.get(1));
         assertArrayEquals(expected, array.getValue(), "Middle byte should be xored with 0x08");
         expected = new byte[] {(byte) 128, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        array.setModification(modifications.get(2));
+        array.setModifications(modifications.get(2));
         assertArrayEquals(expected, array.getValue(), "First byte should be xored with 0x80");
     }
 }

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/MacProbe.java

@@ -9,7 +9,7 @@
 package de.rub.nds.tlsscanner.serverscanner.probe;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
+import de.rub.nds.modifiablevariable.bytearray.ByteArrayXorModification;
 import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
 import de.rub.nds.modifiablevariable.util.Modifiable;
 import de.rub.nds.scanner.core.probe.requirements.ProbeRequirement;
@@ -215,8 +215,8 @@ private WorkflowTrace getAppDataTrace(Config config, int xorPosition) {
         r.getComputations().setMac(modMac);
 
         VariableModification<byte[]> xor =
-                ByteArrayModificationFactory.xor(new byte[] {1}, xorPosition);
-        modMac.setModification(xor);
+                new ByteArrayXorModification(new byte[] {1}, xorPosition);
+        modMac.setModifications(xor);
         lastSendingAction.setConfiguredRecords(List.of(r));
         trace.addTlsAction(new GenericReceiveAction());
         return trace;
@@ -237,7 +237,7 @@ private WorkflowTrace getVerifyDataTrace(Config config, int xorPosition) {
 
     private WorkflowTrace getFinishedTrace(Config config, int xorPosition) {
         VariableModification<byte[]> xor =
-                ByteArrayModificationFactory.xor(new byte[] {1}, xorPosition);
+                new ByteArrayXorModification(new byte[] {1}, xorPosition);
         WorkflowTrace trace =
                 new WorkflowConfigurationFactory(config)
                         .createWorkflowTrace(
@@ -247,7 +247,7 @@ private WorkflowTrace getFinishedTrace(Config config, int xorPosition) {
         r.prepareComputations();
         ModifiableByteArray modMac = new ModifiableByteArray();
         r.getComputations().setMac(modMac);
-        modMac.setModification(xor);
+        modMac.setModifications(xor);
         lastSendingAction.setConfiguredRecords(List.of(new Record(), new Record(), r));
         return trace;
     }

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/bleichenbacher/trace/BleichenbacherWorkflowGenerator.java

@@ -8,7 +8,7 @@
  */
 package de.rub.nds.tlsscanner.serverscanner.probe.bleichenbacher.trace;
 
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
+import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
 import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.constants.RunningModeType;
@@ -34,7 +34,7 @@ public static WorkflowTrace generateWorkflow(
                                 WorkflowTraceType.DYNAMIC_HELLO, RunningModeType.CLIENT);
         RSAClientKeyExchangeMessage cke = new RSAClientKeyExchangeMessage();
         ModifiableByteArray epms = new ModifiableByteArray();
-        epms.setModification(ByteArrayModificationFactory.explicitValue(encryptedPMS));
+        epms.setModifications(new ByteArrayExplicitValueModification(encryptedPMS));
         cke.setPublicKey(epms);
         if (null != type) {
             switch (type) {

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/invalidcurve/InvalidCurveAttacker.java

@@ -8,8 +8,7 @@
  */
 package de.rub.nds.tlsscanner.serverscanner.probe.invalidcurve;
 
-import de.rub.nds.modifiablevariable.ModifiableVariableFactory;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
+import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
 import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
 import de.rub.nds.protocol.constants.EcCurveEquationType;
@@ -200,8 +199,7 @@ private void setPremasterSecret(EllipticCurve curve, int i, Point point) {
 
     private State buildState() {
         EllipticCurve curve = vector.getTargetedCurve();
-        ModifiableByteArray serializedPublicKey =
-                ModifiableVariableFactory.createByteArrayModifiableVariable();
+        ModifiableByteArray serializedPublicKey = new ModifiableByteArray();
         Point basepoint =
                 new Point(
                         new FieldElementFp(publicPointBaseX, curve.getModulus()),
@@ -217,13 +215,13 @@ private State buildState() {
                             basepoint,
                             pointCompressionFormat.getFormat());
         }
-        serializedPublicKey.setModification(ByteArrayModificationFactory.explicitValue(serialized));
-        ModifiableByteArray pms = ModifiableVariableFactory.createByteArrayModifiableVariable();
+        serializedPublicKey.setModifications(new ByteArrayExplicitValueModification(serialized));
+        ModifiableByteArray pms = new ModifiableByteArray();
         byte[] explicitPMS =
                 BigIntegers.asUnsignedByteArray(
                         ArrayConverter.bigIntegerToByteArray(curve.getModulus()).length,
                         premasterSecret);
-        pms.setModification(ByteArrayModificationFactory.explicitValue(explicitPMS));
+        pms.setModifications(new ByteArrayExplicitValueModification(explicitPMS));
 
         WorkflowTrace trace;
         tlsConfig.setWorkflowExecutorShouldClose(false);