Skip to content

Commit ed4afd0

Browse files
committed
update tls-attacker version, fix breaking changes from ModVar update
1 parent 4d9622a commit ed4afd0

File tree

4 files changed

+503
-499
lines changed

4 files changed

+503
-499
lines changed

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/InvalidCurveProbe.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,8 @@ private boolean groupQualifiedForCipherSuite(NamedGroup testGroup, CipherSuite t
686686
if (!testCipher.isTls13()) {
687687
if (namedCurveWitnesses.containsKey(testGroup) == false) {
688688
return false;
689-
} else if ((AlgorithmResolver.getSuiteableLeafCertificateKeyType(testCipher).length > 0
690-
&& AlgorithmResolver.getSuiteableLeafCertificateKeyType(testCipher)[0]
689+
} else if ((AlgorithmResolver.getSuitableLeafCertificateKeyType(testCipher).length > 0
690+
&& AlgorithmResolver.getSuitableLeafCertificateKeyType(testCipher)[0]
691691
== X509PublicKeyType.RSA
692692
&& !namedCurveWitnesses.get(testGroup).isFoundUsingRsaCipher())
693693
|| (testCipher.getKeyExchangeAlgorithm() == KeyExchangeAlgorithm.ECDHE_ECDSA

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/report/ServerReportJsonMapper.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.fasterxml.jackson.databind.SerializationFeature;
2020
import com.fasterxml.jackson.databind.node.ObjectNode;
2121
import com.fasterxml.jackson.datatype.joda.JodaModule;
22+
import de.rub.nds.modifiablevariable.json.ModifiableVariableModule;
2223
import java.io.IOException;
2324
import org.apache.logging.log4j.LogManager;
2425
import org.apache.logging.log4j.Logger;
@@ -46,6 +47,9 @@ public static StreamReadConstraints createStreamReadConstraints() {
4647
/** Constructs a ServerReportJsonMapper with configured ObjectMapper settings. */
4748
public ServerReportJsonMapper() {
4849
this.objectMapper = new ObjectMapper();
50+
// include ModifiableVariable module
51+
objectMapper.registerModule(new ModifiableVariableModule());
52+
objectMapper.setVisibility(ModifiableVariableModule.getFieldVisibilityChecker());
4953

5054
// Apply the stream read constraints defined in the static method
5155
StreamReadConstraints streamReadConstraints = createStreamReadConstraints();

0 commit comments

Comments
 (0)