Merge pull request #48 from tls-attacker/FixByteArraySerialization

Fix byte array serialization

Author: ic0ns

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

@@ -40,7 +40,7 @@
 import de.rub.nds.modifiablevariable.singlebyte.ByteSubtractModification;
 import de.rub.nds.modifiablevariable.singlebyte.ByteXorModification;
 import de.rub.nds.modifiablevariable.string.StringExplicitValueModification;
-import de.rub.nds.modifiablevariable.util.ByteArrayAdapter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import java.io.Serializable;
 import java.util.Objects;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -62,7 +62,6 @@
 @XmlRootElement
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapter(value = ByteArrayAdapter.class, type = byte[].class)
 public abstract class ModifiableVariable<E> implements Serializable {
 
     protected Boolean autoformat = null;
@@ -120,6 +119,7 @@ public void setModification(VariableModification<E> modification) {
         this.modification = modification;
     }
 
+    @XmlTransient
     public VariableModification<E> getModification() {
         return modification;
     }

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

@@ -11,7 +11,7 @@
 
 import de.rub.nds.modifiablevariable.filter.AccessModificationFilter;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
-import de.rub.nds.modifiablevariable.util.ByteArrayAdapter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -25,7 +25,6 @@
 @XmlRootElement
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlJavaTypeAdapter(value = ByteArrayAdapter.class, type = byte[].class)
 public abstract class VariableModification<E> {
 
     protected static final Logger LOGGER = LogManager.getLogger(VariableModification.class);

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayDuplicateModification.java

@@ -11,10 +11,12 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlType(propOrder = { "modificationFilter" })

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayExplicitValueModification.java

@@ -11,12 +11,14 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import java.util.Arrays;
 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;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlType(propOrder = { "explicitValue", "modificationFilter" })
@@ -25,6 +27,7 @@ public class ByteArrayExplicitValueModification extends VariableModification<byt
 
     private static final int MAX_EXPLICIT_VALUE = 256;
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] explicitValue;
 
     public ByteArrayExplicitValueModification() {

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayInsertModification.java

@@ -11,12 +11,14 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import java.util.Arrays;
 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;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlType(propOrder = { "bytesToInsert", "startPosition", "modificationFilter" })
@@ -27,6 +29,7 @@ public class ByteArrayInsertModification extends VariableModification<byte[]> {
 
     private static final int MAX_INSERT_MODIFIER = 32;
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] bytesToInsert;
 
     private int startPosition;

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayPayloadModification.java

@@ -11,21 +11,25 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import java.util.Arrays;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlType(propOrder = { "prependPayload", "payload", "appendPayload", "insert", "insertPosition", "modificationFilter" })
-@XmlAccessorType(XmlAccessType.FIELD)
 public class ByteArrayPayloadModification extends VariableModification<byte[]> {
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] prependPayload = new byte[] {};
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] payload = new byte[] {};
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] appendPayload = new byte[] {};
 
     private boolean insert = false;

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayShuffleModification.java

@@ -11,7 +11,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
-import de.rub.nds.modifiablevariable.util.ByteArrayAdapter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import java.util.Arrays;
 import java.util.Random;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -32,6 +32,7 @@ public class ByteArrayShuffleModification extends VariableModification<byte[]> {
 
     private static final int MAX_MODIFIER_VALUE = 256;
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] shuffle;
 
     public ByteArrayShuffleModification() {

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayXorModification.java

@@ -11,12 +11,14 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import java.util.Arrays;
 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;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlType(propOrder = { "xor", "startPosition", "modificationFilter" })
@@ -27,6 +29,7 @@ public class ByteArrayXorModification extends VariableModification<byte[]> {
 
     private static final int MAX_XOR_MODIFIER = 32;
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] xor;
 
     private int startPosition;

src/main/java/de/rub/nds/modifiablevariable/bytearray/ModifiableByteArray.java

@@ -12,7 +12,6 @@
 import de.rub.nds.modifiablevariable.ModifiableVariable;
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
-import de.rub.nds.modifiablevariable.util.ByteArrayAdapter;
 import de.rub.nds.modifiablevariable.util.UnformattedByteArrayAdapter;
 import java.io.Serializable;
 import java.util.Arrays;
@@ -22,14 +21,13 @@
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
+@XmlAccessorType(XmlAccessType.PROPERTY)
 public class ModifiableByteArray extends ModifiableVariable<byte[]> implements Serializable {
 
     public ModifiableByteArray() {
         autoformat = true;
     }
 
-    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     private byte[] originalValue;
 
     @Override
@@ -39,6 +37,7 @@ protected void createRandomModification() {
     }
 
     @Override
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     public byte[] getOriginalValue() {
         return originalValue;
     }
@@ -48,6 +47,7 @@ public void setOriginalValue(byte[] originalValue) {
         this.originalValue = originalValue;
     }
 
+    @XmlJavaTypeAdapter(UnformattedByteArrayAdapter.class)
     public byte[] getAssertEquals() {
         return assertEquals;
     }