json serialization fixes

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.1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
@@ -106,7 +122,8 @@
     <build>
         <finalName>ProtocolAttacker</finalName>
         <plugins>
-            <!--################# default lifecycle plugins #################-->
+            <!--#################
+            default lifecycle plugins #################-->
             <!-- Formatting -->
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
@@ -182,9 +199,11 @@
                     <includes>
                         <include>**/*.java</include>
                     </includes>
-                    <!-- Allow parallel execution of unit tests (execution in series within test classes) -->
+                    <!-- Allow parallel execution of unit tests (execution in series within test
+                    classes) -->
                     <parallel>classes</parallel>
-                    <!-- Can be adjusted depending on the local system, 3 should be a fair default value -->
+                    <!-- Can be adjusted depending on the local system, 3 should be a fair default
+                    value -->
                     <forkCount>3</forkCount>
                     <reuseForks>true</reuseForks>
                     <!-- By default we include all but integration tests during surefire execution -->
@@ -241,7 +260,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
-                    <!-- By default, the Failsafe plugin excludes various files. We have to override that. -->
+                    <!-- By default, the Failsafe plugin excludes various files. We have to override
+                    that. -->
                     <includes>
                         <include>**/*.java</include>
                     </includes>
@@ -266,7 +286,8 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--############ plugins without lifecycle bindings #############-->
+            <!--############
+            plugins without lifecycle bindings #############-->
             <!-- Static code analysis -->
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
@@ -288,7 +309,8 @@
             <build>
                 <pluginManagement>
                     <plugins>
-                        <!-- Configure Surefire to run SlowTests during integration-test phase to speed up the build process -->
+                        <!-- Configure Surefire to run SlowTests during integration-test phase to
+                        speed up the build process -->
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-surefire-plugin</artifactId>

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

@@ -17,6 +17,14 @@ public class DhPrivateKey implements PrivateKeyContainer {
 
     private FfdhGroupParameters parameters;
 
+    @SuppressWarnings("unused")
+    // Default constructor for deserialization
+    private DhPrivateKey() {
+        // Default constructor for deserialization
+        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,14 @@ public class DhPublicKey implements PublicKeyContainer {
 
     private BigInteger publicKey;
 
+    @SuppressWarnings("unused")
+    // Default constructor for deserialization
+    private DhPublicKey() {
+        // Default constructor for deserialization
+        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,15 @@ public class DsaPrivateKey implements PrivateKeyContainer {
     private BigInteger K;
     private DsaParameters dsaParameters;
 
+    @SuppressWarnings("unused")
+    // Default constructor for deserialization
+    private DsaPrivateKey() {
+        // Default constructor for deserialization
+        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,14 @@ public class DsaPublicKey implements PublicKeyContainer {
     private BigInteger Y;
     private DsaParameters dsaParameters;
 
+    @SuppressWarnings("unused")
+    // Default constructor for deserialization
+    private DsaPublicKey() {
+        // Default constructor for deserialization
+        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,14 @@ public class EcdhPrivateKey implements PrivateKeyContainer {
 
     private NamedEllipticCurveParameters parameters;
 
+    @SuppressWarnings("unused")
+    // Default constructor for deserialization
+    private EcdhPrivateKey() {
+        // Default constructor for deserialization
+        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,14 @@ public class EcdhPublicKey implements PublicKeyContainer {
 
     private NamedEllipticCurveParameters parameters;
 
+    @SuppressWarnings("unused")
+    // Default constructor for deserialization
+    private EcdhPublicKey() {
+        // Default constructor for deserialization
+        this.publicPoint = null;
+        this.parameters = null;
+    }
+
     public EcdhPublicKey(Point publicPoint, NamedEllipticCurveParameters parameters) {
         this.publicPoint = publicPoint;
         this.parameters = parameters;

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

@@ -19,6 +19,15 @@ public class EcdsaPrivateKey implements PrivateKeyContainer {
 
     private NamedEllipticCurveParameters parameters;
 
+    @SuppressWarnings("unused")
+    // Default constructor for deserialization
+    private EcdsaPrivateKey() {
+        // Default constructor for deserialization
+        this.privateKey = null;
+        this.nonce = null;
+        this.parameters = null;
+    }
+
     public EcdsaPrivateKey(
             BigInteger privateKey, BigInteger nonce, NamedEllipticCurveParameters parameters) {
         this.privateKey = privateKey;

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

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

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

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