Merge pull request #724 from tls-attacker/dependabot/maven/de.rub.nds-modifiable-variable-5.3.0

dependabot-reviewer-tls-attacker[bot] · web-flow · commit 01d34b10b5b8 · 2025-07-02T13:44:28.000Z
Bump de.rub.nds:modifiable-variable from 5.2.0 to 5.3.0
diff --git a/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/Main.java b/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/Main.java
@@ -10,9 +10,9 @@
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.scanner.core.report.AnsiColor;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsscanner.clientscanner.config.ClientScannerConfig;
 import de.rub.nds.tlsscanner.clientscanner.execution.TlsClientScanner;
 import de.rub.nds.tlsscanner.clientscanner.report.ClientContainerReportCreator;
diff --git a/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/config/delegate/ClientParameterDelegate.java b/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/config/delegate/ClientParameterDelegate.java
@@ -9,9 +9,9 @@
 package de.rub.nds.tlsscanner.clientscanner.config.delegate;
 
 import com.beust.jcommander.Parameter;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.Delegate;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 
 public class ClientParameterDelegate extends Delegate {
 
diff --git a/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/config/delegate/CallbackDelegate.java b/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/config/delegate/CallbackDelegate.java
@@ -9,9 +9,9 @@
 package de.rub.nds.tlsscanner.core.config.delegate;
 
 import com.beust.jcommander.Parameter;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.Delegate;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsattacker.core.state.State;
 import java.io.IOException;
 import java.util.function.Function;
diff --git a/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/config/delegate/DtlsDelegate.java b/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/config/delegate/DtlsDelegate.java
@@ -9,12 +9,12 @@
 package de.rub.nds.tlsscanner.core.config.delegate;
 
 import com.beust.jcommander.Parameter;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.Delegate;
 import de.rub.nds.tlsattacker.core.connection.InboundConnection;
 import de.rub.nds.tlsattacker.core.connection.OutboundConnection;
 import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsattacker.core.layer.constant.StackConfiguration;
 import de.rub.nds.tlsattacker.core.workflow.action.executor.WorkflowExecutorType;
 import de.rub.nds.tlsattacker.transport.TransportHandlerType;
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/Main.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/Main.java
@@ -10,9 +10,9 @@
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.scanner.core.report.AnsiColor;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsscanner.core.report.DefaultPrintingScheme;
 import de.rub.nds.tlsscanner.serverscanner.config.ServerScannerConfig;
 import de.rub.nds.tlsscanner.serverscanner.execution.TlsServerScanner;
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/afterprobe/SessionTicketAfterProbe.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/afterprobe/SessionTicketAfterProbe.java
@@ -9,12 +9,12 @@
 package de.rub.nds.tlsscanner.serverscanner.afterprobe;
 
 import de.rub.nds.protocol.constants.MacAlgorithm;
+import de.rub.nds.protocol.exception.CryptoException;
 import de.rub.nds.scanner.core.afterprobe.AfterProbe;
 import de.rub.nds.scanner.core.config.ScannerDetail;
 import de.rub.nds.scanner.core.passive.ExtractedValueContainer;
 import de.rub.nds.scanner.core.probe.result.DetailedResult;
 import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
-import de.rub.nds.tlsattacker.core.exceptions.CryptoException;
 import de.rub.nds.tlsattacker.core.util.StaticTicketCrypto;
 import de.rub.nds.tlsscanner.core.constants.TlsAnalyzedProperty;
 import de.rub.nds.tlsscanner.core.passive.TrackableValueType;
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/config/delegate/ProxyDelegate.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/config/delegate/ProxyDelegate.java
@@ -10,9 +10,9 @@
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.Delegate;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import java.net.IDN;
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/InvalidCurveProbe.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/InvalidCurveProbe.java
@@ -686,8 +686,8 @@ private boolean groupQualifiedForCipherSuite(NamedGroup testGroup, CipherSuite t
         if (!testCipher.isTls13()) {
             if (namedCurveWitnesses.containsKey(testGroup) == false) {
                 return false;
-            } else if ((AlgorithmResolver.getSuiteableLeafCertificateKeyType(testCipher).length > 0
-                            && AlgorithmResolver.getSuiteableLeafCertificateKeyType(testCipher)[0]
+            } else if ((AlgorithmResolver.getSuitableLeafCertificateKeyType(testCipher).length > 0
+                            && AlgorithmResolver.getSuitableLeafCertificateKeyType(testCipher)[0]
                                     == X509PublicKeyType.RSA
                             && !namedCurveWitnesses.get(testGroup).isFoundUsingRsaCipher())
                     || (testCipher.getKeyExchangeAlgorithm() == KeyExchangeAlgorithm.ECDHE_ECDSA
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/TokenbindingProbe.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/TokenbindingProbe.java
@@ -8,13 +8,13 @@
  */
 package de.rub.nds.tlsscanner.serverscanner.probe;
 
+import de.rub.nds.protocol.exception.WorkflowExecutionException;
 import de.rub.nds.scanner.core.probe.requirements.Requirement;
 import de.rub.nds.scanner.core.probe.result.TestResults;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.constants.ExtensionType;
 import de.rub.nds.tlsattacker.core.constants.TokenBindingKeyParameters;
 import de.rub.nds.tlsattacker.core.constants.TokenBindingVersion;
-import de.rub.nds.tlsattacker.core.exceptions.WorkflowExecutionException;
 import de.rub.nds.tlsattacker.core.state.State;
 import de.rub.nds.tlsattacker.core.workflow.ParallelExecutor;
 import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType;
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/bleichenbacher/vector/Pkcs1VectorGenerator.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/bleichenbacher/vector/Pkcs1VectorGenerator.java
@@ -10,10 +10,10 @@
 
 import de.rub.nds.modifiablevariable.util.DataConverter;
 import de.rub.nds.protocol.crypto.key.RsaPublicKey;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.tlsattacker.core.constants.Bits;
 import de.rub.nds.tlsattacker.core.constants.HandshakeByteLength;
 import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsscanner.serverscanner.probe.bleichenbacher.constans.BleichenbacherScanType;
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/drown/SpecialDrownAttacker.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/drown/SpecialDrownAttacker.java
@@ -9,11 +9,11 @@
 package de.rub.nds.tlsscanner.serverscanner.probe.drown;
 
 import de.rub.nds.modifiablevariable.util.Modifiable;
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.constants.RunningModeType;
 import de.rub.nds.tlsattacker.core.constants.SSL2CipherSuite;
 import de.rub.nds.tlsattacker.core.constants.SSL2MessageType;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsattacker.core.protocol.message.SSL2ClientMasterKeyMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.SSL2ServerVerifyMessage;
 import de.rub.nds.tlsattacker.core.state.State;
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/report/ServerReportJsonMapper.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/report/ServerReportJsonMapper.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.joda.JodaModule;
+import de.rub.nds.modifiablevariable.json.ModifiableVariableModule;
 import java.io.IOException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -46,6 +47,9 @@ public static StreamReadConstraints createStreamReadConstraints() {
     /** Constructs a ServerReportJsonMapper with configured ObjectMapper settings. */
     public ServerReportJsonMapper() {
         this.objectMapper = new ObjectMapper();
+        // include ModifiableVariable module
+        objectMapper.registerModule(new ModifiableVariableModule());
+        objectMapper.setVisibility(ModifiableVariableModule.getFieldVisibilityChecker());
 
         // Apply the stream read constraints defined in the static method
         StreamReadConstraints streamReadConstraints = createStreamReadConstraints();
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/selector/ConfigSelector.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/selector/ConfigSelector.java
@@ -8,12 +8,12 @@
  */
 package de.rub.nds.tlsscanner.serverscanner.selector;
 
+import de.rub.nds.protocol.exception.ConfigurationException;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.Delegate;
 import de.rub.nds.tlsattacker.core.constants.CipherSuite;
 import de.rub.nds.tlsattacker.core.constants.HandshakeMessageType;
 import de.rub.nds.tlsattacker.core.constants.RunningModeType;
-import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsattacker.core.record.Record;
 import de.rub.nds.tlsattacker.core.state.State;
 import de.rub.nds.tlsattacker.core.workflow.ParallelExecutor;
diff --git a/TLS-Server-Scanner/src/test/resources/report.json b/TLS-Server-Scanner/src/test/resources/report.json
diff --git a/pom.xml b/pom.xml
