Formatting pass, decide whether to keep or skip before merging

00oskpet · 00oskpet · commit 5776d0ad5905 · 2025-03-12T19:21:02.000+01:00
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/TlsExecutionContext.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/TlsExecutionContext.java
@@ -133,10 +133,10 @@ protected TlsStepContext buildStepContext() {
     }
 
     /*
-      public Long incrementWriteRecordNumberEpoch0() {
-        Long old = writeRecordNumberEpoch0;
-        writeRecordNumberEpoch0++;
-        return old;
-      }
-    */
+     * public Long incrementWriteRecordNumberEpoch0() {
+     * Long old = writeRecordNumberEpoch0;
+     * writeRecordNumberEpoch0++;
+     * return old;
+     * }
+     */
 }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/TlsStepContext.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/TlsStepContext.java
@@ -60,7 +60,6 @@ public List<ProtocolMessage> getReceivedMessages() {
         return receivedMessages;
     }
 
-
     public List<ProtocolMessage> getSentMessages() {
         return sentMessages;
     }
@@ -86,9 +85,10 @@ public TlsInput getInput() {
         return (TlsInput) input;
     }
 
-    public  List<Pair<ProtocolMessage, Record>> getReceivedMessageRecordPairs() {
+    public List<Pair<ProtocolMessage, Record>> getReceivedMessageRecordPairs() {
         assert receivedRecords.size() == receivedMessages.size();
-        return IntStream.range(0, receivedMessages.size()).boxed().map(i ->
-        Pair.<ProtocolMessage, Record>of(receivedMessages.get(i), receivedRecords.get(i))).collect(Collectors.toList());
+        return IntStream.range(0, receivedMessages.size()).boxed()
+                .map(i -> Pair.<ProtocolMessage, Record>of(receivedMessages.get(i), receivedRecords.get(i)))
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/AlertInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/AlertInput.java
@@ -22,7 +22,7 @@ public AlertInput() {
     @Override
     public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
         AlertMessage alert = new AlertMessage();
-        alert.setConfig(new byte [] {level.getValue(), description.getValue()});
+        alert.setConfig(new byte[] { level.getValue(), description.getValue() });
         return new TlsProtocolMessage(alert);
     }
 
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/CertificateInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/CertificateInput.java
@@ -8,7 +8,7 @@
 
 public class CertificateInput extends DtlsInput {
 
-    @XmlAttribute(name="empty", required=false)
+    @XmlAttribute(name = "empty", required = false)
     private boolean empty = false;
 
     public CertificateInput() {
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/CertificateRequestInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/CertificateRequestInput.java
@@ -10,7 +10,7 @@
 
 public class CertificateRequestInput extends DtlsInput {
 
-    @XmlAttribute(name="certificate", required=true)
+    @XmlAttribute(name = "certificate", required = true)
     ClientCertificateType certificateType;
 
     public CertificateRequestInput() {
@@ -27,7 +27,8 @@ public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
         CertificateRequestMessage message = new CertificateRequestMessage();
         if (certificateType != null) {
             ModifiableByteArray ctbyte = new ModifiableByteArray();
-            ctbyte.setModification(ByteArrayModificationFactory.explicitValue(new byte[] {certificateType.getValue()}));
+            ctbyte.setModification(
+                    ByteArrayModificationFactory.explicitValue(new byte[] { certificateType.getValue() }));
             message.setClientCertificateTypes(ctbyte);
         }
         return new TlsProtocolMessage(message);
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ChangeCipherSpecInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ChangeCipherSpecInput.java
@@ -32,9 +32,11 @@ public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
 
     @Override
     public void postSendDtlsUpdate(TlsExecutionContext context) {
-        // TLS-Attacker instantiates non-null ciphers even when the pre-master secret has not been yet negotiated.
+        // TLS-Attacker instantiates non-null ciphers even when the pre-master secret
+        // has not been yet negotiated.
         // Here, we replace the ciphers instantiated in such cases by null ciphers.
-        // This ensures that encrypted messages are more likely to make sense to the SUT.
+        // This ensures that encrypted messages are more likely to make sense to the
+        // SUT.
         if (getTlsContext(context).getPreMasterSecret() == null) {
             makeNullCipherAsMostRecent(getTlsContext(context).getRecordLayer().getEncryptor(), getTlsContext(context));
             makeNullCipherAsMostRecent(getTlsContext(context).getRecordLayer().getDecryptor(), getTlsContext(context));
@@ -43,7 +45,7 @@ public void postSendDtlsUpdate(TlsExecutionContext context) {
 
     private void makeNullCipherAsMostRecent(RecordCryptoUnit cryptoUnit, TlsContext context) {
         RecordCipher cipher = cryptoUnit.getRecordMostRecentCipher();
-        if (! (cipher instanceof RecordNullCipher)) {
+        if (!(cipher instanceof RecordNullCipher)) {
             cryptoUnit.removeCiphers(1);
             CipherState cipherState = cipher.getState();
             cryptoUnit.addNewRecordCipher(new RecordNullCipher(context, cipherState));
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientHelloInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientHelloInput.java
@@ -84,7 +84,8 @@ public void postSendDtlsUpdate(State state, TlsExecutionContext context) {
         // to work also with 1-CH DTLS handshakes.
         // (in which case, the clienthello is digested)
         if (forceDigest && state.getTlsContext().getDigest().getRawBytes().length == 0) {
-            DtlsHandshakeMessageFragment fragment = state.getTlsContext().getDtlsFragmentLayer().wrapInSingleFragment(state.getTlsContext().getContext(), message, true);
+            DtlsHandshakeMessageFragment fragment = state.getTlsContext().getDtlsFragmentLayer()
+                    .wrapInSingleFragment(state.getTlsContext().getContext(), message, true);
             state.getTlsContext().getDigest().append(fragment.getCompleteResultingMessage().getValue());
         }
     }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientHelloRenegotiationInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientHelloRenegotiationInput.java
@@ -39,17 +39,18 @@ public ClientHelloRenegotiationInput() {
     @Override
     public boolean isEnabled(TlsExecutionContext context) {
         switch (enabled) {
-            case OWN_EPOCH_CHANGE :
+            case OWN_EPOCH_CHANGE:
                 // send epoch is 1 or more
                 return getTlsContext(context).getWriteEpoch() > 0;
-            case SERVER_EPOCH_CHANGE :
+            case SERVER_EPOCH_CHANGE:
                 // receive epoch is 1 or more
                 return getTlsContext(context).getReadEpoch() > 0;
-            case ONCE :
+            case ONCE:
                 return getTlsExecutionContext(context)
                         .getTlsStepContextStream()
-                        .noneMatch(s -> this.equals(s.getInput()) && s.getIndex() != getTlsExecutionContext(context).getStepCount() - 1);
-            default :
+                        .noneMatch(s -> this.equals(s.getInput())
+                                && s.getIndex() != getTlsExecutionContext(context).getStepCount() - 1);
+            default:
                 return true;
         }
     }
@@ -68,15 +69,15 @@ public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
         if (!isShort) {
             ModifiableByteArray sbyte = new ModifiableByteArray();
             sbyte.setModification(new ByteArrayExplicitValueModification(
-                    new byte[]{}));
+                    new byte[] {}));
             message.setSessionId(sbyte);
         }
 
         // mbedtls will only engage in renegotiation if the cookie is empty
         if (!withCookie && getTlsContext(context).getDtlsCookie() != null) {
             ModifiableByteArray sbyte = new ModifiableByteArray();
             sbyte.setModification(new ByteArrayExplicitValueModification(
-                    new byte[]{}));
+                    new byte[] {}));
             message.setCookie(sbyte);
         }
 
@@ -87,12 +88,12 @@ public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
     public void postReceiveUpdate(TlsOutput output, OutputChecker<TlsOutput> abstractOutputChecker,
             TlsExecutionContext context) {
         switch (enabled) {
-            case ON_SERVER_HELLO :
+            case ON_SERVER_HELLO:
                 if (!TlsOutputChecker.hasServerHello(output)) {
                     getTlsExecutionContext(context).disableExecution();
                 }
                 break;
-            default :
+            default:
                 break;
         }
         super.postReceiveUpdate(output, abstractOutputChecker, context);
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientKeyExchangeInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ClientKeyExchangeInput.java
@@ -38,28 +38,28 @@ public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
             throw new RuntimeException("Algorithm not set");
         }
         switch (algorithm) {
-            case RSA :
+            case RSA:
                 message = new RSAClientKeyExchangeMessage();
                 break;
-            case PSK :
+            case PSK:
                 message = new PskClientKeyExchangeMessage();
                 break;
-            case DH :
+            case DH:
                 message = new DHClientKeyExchangeMessage();
                 break;
-            case ECDH :
+            case ECDH:
                 message = new ECDHClientKeyExchangeMessage();
                 break;
-            case PSK_RSA :
+            case PSK_RSA:
                 message = new PskRsaClientKeyExchangeMessage();
                 break;
-            case GOST :
+            case GOST:
                 message = new GOSTClientKeyExchangeMessage();
                 break;
-            case SRP :
+            case SRP:
                 message = new SrpClientKeyExchangeMessage();
                 break;
-            default :
+            default:
                 throw new RuntimeException("Algorithm " + algorithm
                         + " not supported");
 
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/DtlsInputWrapper.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/DtlsInputWrapper.java
@@ -5,7 +5,7 @@
 import se.uu.it.dtlsfuzzer.components.sul.mapper.TlsProtocolMessage;
 import se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.outputs.TlsOutput;
 
-public class DtlsInputWrapper extends DtlsInput{
+public class DtlsInputWrapper extends DtlsInput {
     private DtlsInput input;
 
     public DtlsInputWrapper(DtlsInput input) {
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/FinishedInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/FinishedInput.java
@@ -25,8 +25,10 @@ public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
         // System.out.println(ArrayConverter.bytesToHexString(state.getTlsContext().getDigest().getRawBytes()));
         FinishedMessage message = new FinishedMessage();
         lastSequenceNumber = getTlsContext(context).getWriteSequenceNumber(getTlsContext(context).getWriteEpoch());
-//        getTlsContext(context).setWriteEpoch(getTlsContext(context).getWriteEpoch() + 1);
-//        getTlsContext(context).setWriteSequenceNumber(getTlsContext(context).getWriteEpoch(), 0L);
+        // getTlsContext(context).setWriteEpoch(getTlsContext(context).getWriteEpoch() +
+        // 1);
+        // getTlsContext(context).setWriteSequenceNumber(getTlsContext(context).getWriteEpoch(),
+        // 0L);
         return new TlsProtocolMessage(message);
     }
 
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/GenericTlsInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/GenericTlsInput.java
@@ -104,7 +104,7 @@ public class GenericTlsInput extends DtlsInput {
             @XmlElement(type = SrpServerKeyExchangeMessage.class, name = "SrpServerKeyExchange"),
             @XmlElement(type = SrpClientKeyExchangeMessage.class, name = "SrpClientKeyExchange"),
             @XmlElement(type = EndOfEarlyDataMessage.class, name = "EndOfEarlyData"),
-            @XmlElement(type = EncryptedExtensionsMessage.class, name = "EncryptedExtensions")})
+            @XmlElement(type = EncryptedExtensionsMessage.class, name = "EncryptedExtensions") })
     private ProtocolMessage message;
 
     public GenericTlsInput() {
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ServerHelloInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ServerHelloInput.java
@@ -74,7 +74,7 @@ public void postReceiveUpdate(TlsOutput output, TlsOutputChecker abstractOutputC
             Pair<ProtocolMessage, Record> lastChPair = null;
             int lastChStepIndex = -1;
             List<Pair<ProtocolMessage, Record>> msgRecPairs = ctx.getReceivedMessagesAndRecords();
-            for (int i=0; i<msgRecPairs.size(); i++) {
+            for (int i = 0; i < msgRecPairs.size(); i++) {
                 if (msgRecPairs.get(i).getKey() instanceof ClientHelloMessage) {
                     lastChStepIndex = i;
                     lastChPair = msgRecPairs.get(i);
@@ -83,15 +83,17 @@ public void postReceiveUpdate(TlsOutput output, TlsOutputChecker abstractOutputC
 
             assert lastChPair != null;
 
-            // we reset the digest and append to it, in reverse order SH, the last CH before the SH and optionally the HR which prompted the CH (if such a HR was sent)
+            // we reset the digest and append to it, in reverse order SH, the last CH before
+            // the SH and optionally the HR which prompted the CH (if such a HR was sent)
             getTlsContext(ctx).getDigest().reset();
 
             if (digestHR && ctx.getStepContext(lastChStepIndex).getInput() instanceof HelloRequestInput) {
-                byte [] hrBytes = ctx.getStepContext(lastChStepIndex).getReceivedRecords().get(0).getCleanProtocolMessageBytes().getValue();
+                byte[] hrBytes = ctx.getStepContext(lastChStepIndex).getReceivedRecords().get(0)
+                        .getCleanProtocolMessageBytes().getValue();
                 getTlsContext(context).getDigest().append(hrBytes);
             }
-            byte [] chBytes = lastChPair.getRight().getCleanProtocolMessageBytes().getValue();
-            byte [] shBytes = ctx.getStepContext().getSentRecords().get(0).getCleanProtocolMessageBytes().getValue();
+            byte[] chBytes = lastChPair.getRight().getCleanProtocolMessageBytes().getValue();
+            byte[] shBytes = ctx.getStepContext().getSentRecords().get(0).getCleanProtocolMessageBytes().getValue();
             getTlsContext(context).getDigest().append(chBytes);
             getTlsContext(context).getDigest().append(shBytes);
         }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ServerKeyExchangeInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/ServerKeyExchangeInput.java
@@ -32,16 +32,16 @@ public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
         }
         ProtocolMessage ske = null;
         switch (algorithm) {
-            case DH :
+            case DH:
                 ske = new DHEServerKeyExchangeMessage();
                 break;
-            case ECDH :
+            case ECDH:
                 ske = new ECDHEServerKeyExchangeMessage();
                 break;
             case PSK:
                 ske = new PskServerKeyExchangeMessage();
                 break;
-            default :
+            default:
                 throw new RuntimeException("Algorithm " + algorithm
                         + " not supported");
         }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/WaitClientConnectInput.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/inputs/WaitClientConnectInput.java
@@ -1,13 +1,13 @@
 package se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.inputs;
 
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.context.ExecutionContext;
 import org.apache.commons.lang3.NotImplementedException;
+import se.uu.it.dtlsfuzzer.components.sul.mapper.TlsExecutionContext;
 import se.uu.it.dtlsfuzzer.components.sul.mapper.TlsProtocolMessage;
 
 public class WaitClientConnectInput extends TlsInput {
 
     @Override
-    public TlsProtocolMessage generateProtocolMessage(ExecutionContext context) {
+    public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {
         throw new NotImplementedException("Cannot generate message");
     }
 
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/outputs/TlsOutputChecker.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/symbols/outputs/TlsOutputChecker.java
@@ -7,7 +7,8 @@
 import se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.inputs.KeyExchangeAlgorithm;
 
 /**
- * Provides an interface for analyzing outputs so that how the actual strings are formed is decoupled from the checking code.
+ * Provides an interface for analyzing outputs so that how the actual strings
+ * are formed is decoupled from the checking code.
  */
 public class TlsOutputChecker implements OutputChecker<TlsOutput> {
     private static String APPLICATION = "APPLICATION";
@@ -119,7 +120,7 @@ public static boolean hasServerKeyExchange(TlsOutput output) {
     }
 
     public static X509PublicKeyType getClientCertificateType(TlsOutput output) {
-        assert(hasCertificate(output) && output.isAtomic());
+        assert (hasCertificate(output) && output.isAtomic());
         if (hasEmptyCertificate(output)) {
             return null;
         } else {
@@ -138,16 +139,16 @@ public static X509PublicKeyType getClientCertificateType(TlsOutput output) {
     }
 
     public static X509PublicKeyType getCertificateType(TlsOutput output) {
-        Optional<X509PublicKeyType> opt = Arrays.stream(X509PublicKeyType.values()).filter(ctype -> output.getName().contains(ctype.name())).findFirst();
+        Optional<X509PublicKeyType> opt = Arrays.stream(X509PublicKeyType.values())
+                .filter(ctype -> output.getName().contains(ctype.name())).findFirst();
         return opt.orElseGet(() -> null);
     }
 
-
     public static KeyExchangeAlgorithm getKeyExchangeAlgorithm(TlsOutput output) {
         if (hasClientKeyExchange(output) || hasServerKeyExchange(output)) {
             String keyExchange = output.getName().split("_", -1)[0];
             if (keyExchange.endsWith("DHE")) {
-                keyExchange = keyExchange.substring(0, keyExchange.length()-1);
+                keyExchange = keyExchange.substring(0, keyExchange.length() - 1);
             }
             return KeyExchangeAlgorithm.valueOf(keyExchange);
         }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public List<ProtocolMessage> getReceivedMessages() {`
`60`	`60`	`return receivedMessages;`
`61`	`61`	`}`
`62`	`62`
`63`		`-`
`64`	`63`	`public List<ProtocolMessage> getSentMessages() {`
`65`	`64`	`return sentMessages;`
`66`	`65`	`}`
`@@ -86,9 +85,10 @@ public TlsInput getInput() {`
`86`	`85`	`return (TlsInput) input;`
`87`	`86`	`}`
`88`	`87`
`89`		`- public List<Pair<ProtocolMessage, Record>> getReceivedMessageRecordPairs() {`
	`88`	`+ public List<Pair<ProtocolMessage, Record>> getReceivedMessageRecordPairs() {`
`90`	`89`	`assert receivedRecords.size() == receivedMessages.size();`
`91`		`- return IntStream.range(0, receivedMessages.size()).boxed().map(i ->`
`92`		`- Pair.<ProtocolMessage, Record>of(receivedMessages.get(i), receivedRecords.get(i))).collect(Collectors.toList());`
	`90`	`+ return IntStream.range(0, receivedMessages.size()).boxed()`
	`91`	`+ .map(i -> Pair.<ProtocolMessage, Record>of(receivedMessages.get(i), receivedRecords.get(i)))`
	`92`	`+ .collect(Collectors.toList());`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public AlertInput() {`
`22`	`22`	`@Override`
`23`	`23`	`public TlsProtocolMessage generateProtocolMessage(TlsExecutionContext context) {`
`24`	`24`	`AlertMessage alert = new AlertMessage();`
`25`		`- alert.setConfig(new byte [] {level.getValue(), description.getValue()});`
	`25`	`+ alert.setConfig(new byte[] { level.getValue(), description.getValue() });`
`26`	`26`	`return new TlsProtocolMessage(alert);`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@ public void postSendDtlsUpdate(State state, TlsExecutionContext context) {`
`84`	`84`	`// to work also with 1-CH DTLS handshakes.`
`85`	`85`	`// (in which case, the clienthello is digested)`
`86`	`86`	`if (forceDigest && state.getTlsContext().getDigest().getRawBytes().length == 0) {`
`87`		`- DtlsHandshakeMessageFragment fragment = state.getTlsContext().getDtlsFragmentLayer().wrapInSingleFragment(state.getTlsContext().getContext(), message, true);`
	`87`	`+ DtlsHandshakeMessageFragment fragment = state.getTlsContext().getDtlsFragmentLayer()`
	`88`	`+ .wrapInSingleFragment(state.getTlsContext().getContext(), message, true);`
`88`	`89`	`state.getTlsContext().getDigest().append(fragment.getCompleteResultingMessage().getValue());`
`89`	`90`	`}`
`90`	`91`	`}`