Merge origin/testsuite-compatibility into tls-testsuite

Conflicts:
	.gitignore
	src/main/java/de/rub/nds/modifiablevariable/ModifiableVariable.java

Author: mmaehren

.gitignore

@@ -9,4 +9,4 @@ buildNumber.properties
 .mvn/timing.properties
 /nbproject/
 *.idea/
-ModifiableVariable.iml
+ModifiableVariable.iml

src/main/java/de/rub/nds/modifiablevariable/ModifiableVariable.java

@@ -12,6 +12,7 @@
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerAddModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerExplicitValueModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerInteractiveModification;
+import de.rub.nds.modifiablevariable.biginteger.BigIntegerMultiplyModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftLeftModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftRightModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerSubtractModification;
@@ -73,6 +74,7 @@ public abstract class ModifiableVariable<E> implements Serializable {
         @XmlElement(type = BigIntegerExplicitValueModification.class, name = "BigIntegerExplicitValueModification"),
         @XmlElement(type = BigIntegerAddModification.class, name = "BigIntegerAddModification"),
         @XmlElement(type = BigIntegerInteractiveModification.class, name = "BigIntegerInteractiveModification"),
+        @XmlElement(type = BigIntegerMultiplyModification.class, name = "BigIntegerMultiplyModification"),
         @XmlElement(type = BooleanToggleModification.class, name = "BooleanToggleModification"),
         @XmlElement(type = BooleanExplicitValueModification.class, name = "BooleanExplicitValueModification"),
         @XmlElement(type = ByteArrayXorModification.class, name = "ByteArrayXorModification"),

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerModificationFactory.java

@@ -58,6 +58,10 @@ public static BigIntegerShiftRightModification shiftRight(final Integer shift) {
         return new BigIntegerShiftRightModification(shift);
     }
 
+    public static BigIntegerMultiplyModification multiply(final BigInteger factor) {
+        return new BigIntegerMultiplyModification(factor);
+    }
+
     public static VariableModification<BigInteger> sub(final String subtrahend) {
         return sub(new BigInteger(subtrahend));
     }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerMultiplyModification.java

@@ -0,0 +1,82 @@
+/**
+ * ModifiableVariable - A Variable Concept for Runtime Modifications
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.modifiablevariable.biginteger;
+
+import de.rub.nds.modifiablevariable.VariableModification;
+import java.math.BigInteger;
+import java.util.Objects;
+import java.util.Random;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement
+@XmlType(propOrder = { "factor", "modificationFilter" })
+@XmlAccessorType(XmlAccessType.FIELD)
+public class BigIntegerMultiplyModification extends VariableModification<BigInteger> {
+
+    private final static int MAX_FACTOR_LENGTH = 8;
+
+    private BigInteger factor;
+
+    public BigIntegerMultiplyModification() {
+
+    }
+
+    public BigIntegerMultiplyModification(BigInteger bi) {
+        this.factor = bi;
+    }
+
+    @Override
+    protected BigInteger modifyImplementationHook(BigInteger input) {
+        if (input == null) {
+            input = BigInteger.ZERO;
+        }
+        return input.multiply(factor);
+    }
+
+    public BigInteger getFactor() {
+        return factor;
+    }
+
+    public void setFactor(BigInteger factor) {
+        this.factor = factor;
+    }
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerMultiplyModification(factor.add(new BigInteger(MAX_FACTOR_LENGTH, new Random())));
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 61 * hash + Objects.hashCode(this.factor);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BigIntegerMultiplyModification other = (BigIntegerMultiplyModification) obj;
+        if (!Objects.equals(this.factor, other.factor)) {
+            return false;
+        }
+        return true;
+    }
+}

src/main/java/de/rub/nds/modifiablevariable/util/Modifiable.java

@@ -178,6 +178,10 @@ public static ModifiableBigInteger shiftRightBigInteger(Integer i) {
         return getModifiableBigIntegerWithModification(BigIntegerModificationFactory.shiftRight(i));
     }
 
+    public static ModifiableBigInteger multiplyBigInteger(BigInteger i) {
+        return getModifiableBigIntegerWithModification(BigIntegerModificationFactory.multiply(i));
+    }
+
     public static ModifiableInteger shiftRight(Integer i) {
         return getModifiableIntegerWithModification(IntegerModificationFactory.shiftRight(i));
     }