Merge pull request #65 from tls-attacker/json

Updates for JSON (De)Serialization

Author: ic0ns

pom.xml

@@ -55,11 +55,27 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
         <!-- scope: compile -->
         <dependency>
             <groupId>de.rub.nds</groupId>
             <artifactId>modifiable-variable</artifactId>
-            <version>5.1.2</version>
+            <version>5.2.0</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>

src/main/java/de/rub/nds/protocol/crypto/ec/FieldElement.java

@@ -8,6 +8,7 @@
  */
 package de.rub.nds.protocol.crypto.ec;
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import java.io.Serializable;
@@ -22,6 +23,7 @@
  * All arithmetic operations are performed within the laws of the specified field.
  */
 @XmlAccessorType(XmlAccessType.FIELD)
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
 public abstract class FieldElement implements Serializable {
 
     /*
@@ -31,7 +33,13 @@ public abstract class FieldElement implements Serializable {
     private final BigInteger data;
     private final BigInteger modulus;
 
-    public FieldElement(BigInteger data, BigInteger modulus) {
+    /** Default constructor for deserialization. */
+    protected FieldElement() {
+        this.data = null;
+        this.modulus = null;
+    }
+
+    protected FieldElement(BigInteger data, BigInteger modulus) {
         this.data = data;
         this.modulus = modulus;
     }

src/main/java/de/rub/nds/protocol/crypto/ec/FieldElementF2m.java

@@ -35,6 +35,8 @@ public FieldElementF2m(BigInteger data, BigInteger modulus) {
         super(data, modulus);
     }
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
     private FieldElementF2m() {
         super(null, null);
     }

src/main/java/de/rub/nds/protocol/crypto/ec/FieldElementFp.java

@@ -18,6 +18,8 @@ public FieldElementFp(BigInteger data, BigInteger modulus) {
         super(data.mod(modulus), modulus);
     }
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
     private FieldElementFp() {
         super(null, null);
     }

src/main/java/de/rub/nds/protocol/crypto/key/DhPrivateKey.java

@@ -17,6 +17,13 @@ public class DhPrivateKey implements PrivateKeyContainer {
 
     private FfdhGroupParameters parameters;
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
+    private DhPrivateKey() {
+        this.privateKey = null;
+        this.parameters = null;
+    }
+
     public DhPrivateKey(BigInteger privateKey, FfdhGroupParameters parameters) {
         this.privateKey = privateKey;
         this.parameters = parameters;

src/main/java/de/rub/nds/protocol/crypto/key/DhPublicKey.java

@@ -19,6 +19,13 @@ public class DhPublicKey implements PublicKeyContainer {
 
     private BigInteger publicKey;
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
+    private DhPublicKey() {
+        this.parameters = null;
+        this.publicKey = null;
+    }
+
     public DhPublicKey(BigInteger publicKey, BigInteger generator, BigInteger modulus) {
         this.parameters = new ExplicitFfdhGroupParameters(generator, modulus);
         this.publicKey = publicKey;

src/main/java/de/rub/nds/protocol/crypto/key/DsaPrivateKey.java

@@ -17,6 +17,14 @@ public class DsaPrivateKey implements PrivateKeyContainer {
     private BigInteger K;
     private DsaParameters dsaParameters;
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
+    private DsaPrivateKey() {
+        this.X = null;
+        this.K = null;
+        this.dsaParameters = null;
+    }
+
     /**
      * Create a DSA private key with explicit parameters
      *

src/main/java/de/rub/nds/protocol/crypto/key/DsaPublicKey.java

@@ -18,6 +18,13 @@ public class DsaPublicKey implements PublicKeyContainer {
     private BigInteger Y;
     private DsaParameters dsaParameters;
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
+    private DsaPublicKey() {
+        this.Y = null;
+        this.dsaParameters = null;
+    }
+
     /**
      * Create a DSA public key with explicit parameters
      *

src/main/java/de/rub/nds/protocol/crypto/key/EcdhPrivateKey.java

@@ -17,6 +17,13 @@ public class EcdhPrivateKey implements PrivateKeyContainer {
 
     private NamedEllipticCurveParameters parameters;
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
+    private EcdhPrivateKey() {
+        this.privateKey = null;
+        this.parameters = null;
+    }
+
     public EcdhPrivateKey(BigInteger privateKey, NamedEllipticCurveParameters parameters) {
         this.privateKey = privateKey;
         this.parameters = parameters;

src/main/java/de/rub/nds/protocol/crypto/key/EcdhPublicKey.java

@@ -19,6 +19,13 @@ public class EcdhPublicKey implements PublicKeyContainer {
 
     private NamedEllipticCurveParameters parameters;
 
+    /** Default constructor for deserialization. */
+    @SuppressWarnings("unused")
+    private EcdhPublicKey() {
+        this.publicPoint = null;
+        this.parameters = null;
+    }
+
     public EcdhPublicKey(Point publicPoint, NamedEllipticCurveParameters parameters) {
         this.publicPoint = publicPoint;
         this.parameters = parameters;