Rename Sul to SUL in all PSF uses

kostis · kostis · commit bb7c65957fff · 2026-03-23T21:04:39.000+01:00
diff --git a/install.sh b/install.sh
@@ -8,7 +8,7 @@ readonly SCRIPT_DIR
 readonly PATCHES_DIR="${SCRIPT_DIR}/experiments/patches"
 
 
-readonly PROTOCOLSTATEFUZZER_COMMIT="83bcc0e"
+readonly PROTOCOLSTATEFUZZER_COMMIT="658a49d"
 readonly PROTOCOLSTATEFUZZER_REP_URL="https://github.com/protocol-fuzzing/protocol-state-fuzzer.git"
 readonly PROTOCOLSTATEFUZZER_FOLDER="ProtocolState-Fuzzer"
 
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/MultiBuilder.java b/src/main/java/se/uu/it/dtlsfuzzer/MultiBuilder.java
@@ -5,7 +5,7 @@
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.xml.AlphabetSerializerXml;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.config.LearnerConfigStandard;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.statistics.MealyMachineWrapper;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzer;
 import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzerBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzerComposerStandard;
@@ -40,7 +40,7 @@ public class MultiBuilder implements StateFuzzerConfigBuilder,
     private AlphabetBuilder<TlsInput> alphabetBuilder = new AlphabetBuilderStandard<>(
             new AlphabetSerializerXml<>(TlsInput.class, TlsAlphabetPojoXml.class));
 
-    private SulBuilder<TlsInput, TlsOutput, TlsExecutionContext> sulBuilder = new TlsSulBuilder();
+    private SULBuilder<TlsInput, TlsOutput, TlsExecutionContext> sulBuilder = new TlsSulBuilder();
 
     @Override
     public StateFuzzerClientConfig buildClientConfig() {
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/TlsSul.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/TlsSul.java
@@ -5,9 +5,9 @@
  */
 package se.uu.it.dtlsfuzzer.components.sul.core;
 
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSul;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulAdapter;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSUL;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULAdapter;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.sulwrappers.DynamicPortProvider;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.Mapper;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
@@ -42,11 +42,11 @@
 import se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.outputs.TlsOutput;
 
 /**
- * Implementation of {@link AbstractSul} that works for both clients and servers.
+ * Implementation of {@link AbstractSUL} that works for both clients and servers.
  *
  * @author robert, paul
  */
-public class TlsSul implements AbstractSul<TlsInput, TlsOutput, TlsExecutionContext> {
+public class TlsSul implements AbstractSUL<TlsInput, TlsOutput, TlsExecutionContext> {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -93,7 +93,7 @@ public class TlsSul implements AbstractSul<TlsInput, TlsOutput, TlsExecutionCont
 
     private CleanupTasks cleanupTasks;
 
-    private SulAdapter sulAdapter;
+    private SULAdapter sulAdapter;
 
     private DynamicPortProvider dynamicPortProvider;
 
@@ -132,7 +132,7 @@ public void run() {
         }
     }
 
-    void setSulAdapter(SulAdapter sulAdapter) {
+    void setSulAdapter(SULAdapter sulAdapter) {
         this.sulAdapter = sulAdapter;
     }
 
@@ -159,7 +159,7 @@ public void pre() {
             if (!sulConfig.isFuzzingClient()) {
                 OutboundConnection connection = state.getConfig().getDefaultClientConnection();
                 if (dynamicPortProvider != null) {
-                    connection.setPort(dynamicPortProvider.getSulPort());
+                    connection.setPort(dynamicPortProvider.getSULPort());
                 }
                 transportHandler = new ClientUdpTransportHandler(connection);
             } else {
@@ -355,7 +355,7 @@ private void exportEffectiveSulConfig(Config config, String path) {
     }
 
     @Override
-    public SulConfig getSulConfig() {
+    public SULConfig getSULConfig() {
         return sulConfig;
     }
 
@@ -380,7 +380,7 @@ public Mapper<TlsInput, TlsOutput, TlsExecutionContext> getMapper() {
         }
 
     @Override
-    public SulAdapter getSulAdapter() {
+    public SULAdapter getSULAdapter() {
         return sulAdapter;
     }
 }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/TlsSulAdapter.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/TlsSulAdapter.java
@@ -1,7 +1,7 @@
 package se.uu.it.dtlsfuzzer.components.sul.core;
 
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulAdapter;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulAdapterConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULAdapter;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULAdapterConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.utils.CleanupTasks;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -26,7 +26,7 @@
  * "stop" - prompts the launch server to stop the current SUL process.
  * The server generates "stopped" to signal that the SUL process has terminated.
  */
-public final class TlsSulAdapter implements SulAdapter {
+public final class TlsSulAdapter implements SULAdapter {
     private static final Logger LOGGER = LogManager.getLogger();
 
     private static final String CMD_STOP = "stop";
@@ -42,7 +42,7 @@ public final class TlsSulAdapter implements SulAdapter {
     private boolean stopped;
     private boolean isClientLauncher;
 
-    public TlsSulAdapter(SulAdapterConfig adapterConfig, CleanupTasks tasks, boolean isClientLauncher) {
+    public TlsSulAdapter(SULAdapterConfig adapterConfig, CleanupTasks tasks, boolean isClientLauncher) {
         resetAddress = new InetSocketAddress(adapterConfig.getAdapterAddress(), adapterConfig.getAdapterPort());
         try {
             adapterSocket = new Socket();
@@ -162,7 +162,7 @@ public boolean checkStopped() {
      * {@inheritDoc}
      */
     @Override
-    public Integer getSulPort() {
+    public Integer getSULPort() {
         return sulPort;
     }
 
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/TlsSulBuilder.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/TlsSulBuilder.java
@@ -1,9 +1,9 @@
 package se.uu.it.dtlsfuzzer.components.sul.core;
 
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapper;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapperStandard;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULBuilder;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULWrapper;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULWrapperStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.mappers.MapperComposer;
 import com.github.protocolfuzzing.protocolstatefuzzer.utils.CleanupTasks;
@@ -18,12 +18,12 @@
 import se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.outputs.TlsOutputBuilder;
 import se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.outputs.TlsOutputChecker;
 
-public class TlsSulBuilder implements SulBuilder<TlsInput, TlsOutput, TlsExecutionContext> {
+public class TlsSulBuilder implements SULBuilder<TlsInput, TlsOutput, TlsExecutionContext> {
 
     private TlsSulAdapter sulAdapter = null;
 
     @Override
-    public TlsSul buildSul(SulConfig sulConfig, CleanupTasks cleanupTasks) {
+    public TlsSul buildSUL(SULConfig sulConfig, CleanupTasks cleanupTasks) {
         MapperConfig mapperConfig = sulConfig.getMapperConfig();
         TlsOutputChecker outputChecker = new TlsOutputChecker();
         TlsOutputBuilder outputBuilder = new TlsOutputBuilder();
@@ -34,16 +34,16 @@ public TlsSul buildSul(SulConfig sulConfig, CleanupTasks cleanupTasks) {
 
         TlsSul tlsSul = new TlsSul((TlsSulConfig) sulConfig, mapperConfig, mapperComposer, cleanupTasks);
 
-        if (sulConfig.getSulAdapterConfig().getAdapterPort() != null) {
-            sulAdapter = new TlsSulAdapter(sulConfig.getSulAdapterConfig(), cleanupTasks, sulConfig.isFuzzingClient());
+        if (sulConfig.getSULAdapterConfig().getAdapterPort() != null) {
+            sulAdapter = new TlsSulAdapter(sulConfig.getSULAdapterConfig(), cleanupTasks, sulConfig.isFuzzingClient());
             tlsSul.setSulAdapter(sulAdapter);
         }
         return tlsSul;
     }
 
 
     @Override
-    public SulWrapper<TlsInput, TlsOutput, TlsExecutionContext> buildWrapper() {
-        return new SulWrapperStandard<>();
+    public SULWrapper<TlsInput, TlsOutput, TlsExecutionContext> buildWrapper() {
+        return new SULWrapperStandard<>();
     }
 }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/config/TlsSulClientConfig.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/config/TlsSulClientConfig.java
@@ -1,21 +1,21 @@
 package se.uu.it.dtlsfuzzer.components.sul.core.config;
 
 import com.beust.jcommander.ParametersDelegate;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulAdapterConfigStandard;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulClientConfigStandard;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULAdapterConfigStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULClientConfigStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfigStandard;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.ServerDelegate;
 import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 
-public class TlsSulClientConfig extends SulClientConfigStandard implements TlsSulConfig {
+public class TlsSulClientConfig extends SULClientConfigStandard implements TlsSulConfig {
 
     @ParametersDelegate
     private ClientConfigDelegate configDelegate = new ClientConfigDelegate();
 
     public TlsSulClientConfig() {
-        super(new MapperConfigStandard(), new SulAdapterConfigStandard());
+        super(new MapperConfigStandard(), new SULAdapterConfigStandard());
     }
 
     @Override
@@ -38,7 +38,7 @@ public void applyDelegate(Config config) throws ConfigurationException {
     }
 
     @Override
-    public SulConfig cloneWithThreadId(int threadId) {
+    public SULConfig cloneWithThreadId(int threadId) {
         TlsSulClientConfig clone = new TlsSulClientConfig();
         clone.clientWait = clientWait;
         int oldPort = getPort();
@@ -58,15 +58,15 @@ public SulConfig cloneWithThreadId(int threadId) {
             int adapterPort = this.sulAdapterConfig.getAdapterPort();
             int newAdapterPort = adapterPort + threadId;
             clone.command = clone.command.replace("-starterAddress localhost:"+adapterPort, "-starterAddress localhost:"+newAdapterPort);
-            clone.sulAdapterConfig = new SulAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
+            clone.sulAdapterConfig = new SULAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
         }
 
         // JSSE-12-0-2 related
         if (clone.command.contains("-threadStarterIpPort localhost:")) {
             int adapterPort = this.sulAdapterConfig.getAdapterPort();
             int newAdapterPort = adapterPort + threadId;
             clone.command = clone.command.replace("-threadStarterIpPort localhost:"+adapterPort, "-threadStarterIpPort localhost:"+newAdapterPort);
-            clone.sulAdapterConfig = new SulAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
+            clone.sulAdapterConfig = new SULAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
         }
 
         return clone;
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/config/TlsSulConfig.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/config/TlsSulConfig.java
@@ -1,7 +1,7 @@
 package se.uu.it.dtlsfuzzer.components.sul.core.config;
 
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
 
-public interface TlsSulConfig extends SulConfig {
+public interface TlsSulConfig extends SULConfig {
     ConfigDelegate getConfigDelegate();
 }
diff --git a/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/config/TlsSulServerConfig.java b/src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/config/TlsSulServerConfig.java
@@ -1,21 +1,21 @@
 package se.uu.it.dtlsfuzzer.components.sul.core.config;
 
 import com.beust.jcommander.ParametersDelegate;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulAdapterConfigStandard;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulServerConfigStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULAdapterConfigStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULServerConfigStandard;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfigStandard;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
 import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 
-public class TlsSulServerConfig extends SulServerConfigStandard implements TlsSulConfig {
+public class TlsSulServerConfig extends SULServerConfigStandard implements TlsSulConfig {
 
     @ParametersDelegate
     private ServerConfigDelegate configDelegate = new ServerConfigDelegate();
 
     public TlsSulServerConfig() {
-        super(new MapperConfigStandard(), new SulAdapterConfigStandard());
+        super(new MapperConfigStandard(), new SULAdapterConfigStandard());
     }
 
     @Override
@@ -38,7 +38,7 @@ public void applyDelegate(Config config) throws ConfigurationException {
     }
 
     @Override
-    public SulConfig cloneWithThreadId(int threadId) {
+    public SULConfig cloneWithThreadId(int threadId) {
         TlsSulServerConfig clone = new TlsSulServerConfig();
         clone.setResponseWait(getResponseWait());
         clone.setStartWait(getStartWait());
@@ -68,15 +68,15 @@ public SulConfig cloneWithThreadId(int threadId) {
             int adapterPort = this.sulAdapterConfig.getAdapterPort();
             int newAdapterPort = adapterPort + threadId;
             clone.command = clone.command.replace("-starterAddress localhost:"+adapterPort, "-starterAddress localhost:"+newAdapterPort);
-            clone.sulAdapterConfig = new SulAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
+            clone.sulAdapterConfig = new SULAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
         }
 
         // JSSE-12-0-2 related
         if (clone.command.contains("-threadStarterIpPort localhost:")) {
             int adapterPort = this.sulAdapterConfig.getAdapterPort();
             int newAdapterPort = adapterPort + threadId;
             clone.command = clone.command.replace("-threadStarterIpPort localhost:"+adapterPort, "-threadStarterIpPort localhost:"+newAdapterPort);
-            clone.sulAdapterConfig = new SulAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
+            clone.sulAdapterConfig = new SULAdapterConfigStandard(newAdapterPort, this.sulAdapterConfig.getAdapterAddress());
         }
 
         return clone;

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`*/`
`6`	`6`	`package se.uu.it.dtlsfuzzer.components.sul.core;`
`7`	`7`
`8`		`-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSul;`
`9`		`-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulAdapter;`
`10`		`-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;`
	`8`	`+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSUL;`
	`9`	`+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULAdapter;`
	`10`	`+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;`
`11`	`11`	`import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.sulwrappers.DynamicPortProvider;`
`12`	`12`	`import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.Mapper;`
`13`	`13`	`import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;`
`@@ -42,11 +42,11 @@`
`42`	`42`	`import se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.outputs.TlsOutput;`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * Implementation of {@link AbstractSul} that works for both clients and servers.`
	`45`	`+ * Implementation of {@link AbstractSUL} that works for both clients and servers.`
`46`	`46`	`*`
`47`	`47`	`* @author robert, paul`
`48`	`48`	`*/`
`49`		`-public class TlsSul implements AbstractSul<TlsInput, TlsOutput, TlsExecutionContext> {`
	`49`	`+public class TlsSul implements AbstractSUL<TlsInput, TlsOutput, TlsExecutionContext> {`
`50`	`50`
`51`	`51`	`private static final Logger LOGGER = LogManager.getLogger();`
`52`	`52`
`@@ -93,7 +93,7 @@ public class TlsSul implements AbstractSul<TlsInput, TlsOutput, TlsExecutionCont`
`93`	`93`
`94`	`94`	`private CleanupTasks cleanupTasks;`
`95`	`95`
`96`		`- private SulAdapter sulAdapter;`
	`96`	`+ private SULAdapter sulAdapter;`
`97`	`97`
`98`	`98`	`private DynamicPortProvider dynamicPortProvider;`
`99`	`99`
`@@ -132,7 +132,7 @@ public void run() {`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`- void setSulAdapter(SulAdapter sulAdapter) {`
	`135`	`+ void setSulAdapter(SULAdapter sulAdapter) {`
`136`	`136`	`this.sulAdapter = sulAdapter;`
`137`	`137`	`}`
`138`	`138`
`@@ -159,7 +159,7 @@ public void pre() {`
`159`	`159`	`if (!sulConfig.isFuzzingClient()) {`
`160`	`160`	`OutboundConnection connection = state.getConfig().getDefaultClientConnection();`
`161`	`161`	`if (dynamicPortProvider != null) {`
`162`		`- connection.setPort(dynamicPortProvider.getSulPort());`
	`162`	`+ connection.setPort(dynamicPortProvider.getSULPort());`
`163`	`163`	`}`
`164`	`164`	`transportHandler = new ClientUdpTransportHandler(connection);`
`165`	`165`	`} else {`
`@@ -355,7 +355,7 @@ private void exportEffectiveSulConfig(Config config, String path) {`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`@Override`
`358`		`- public SulConfig getSulConfig() {`
	`358`	`+ public SULConfig getSULConfig() {`
`359`	`359`	`return sulConfig;`
`360`	`360`	`}`
`361`	`361`
`@@ -380,7 +380,7 @@ public Mapper<TlsInput, TlsOutput, TlsExecutionContext> getMapper() {`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`@Override`
`383`		`- public SulAdapter getSulAdapter() {`
	`383`	`+ public SULAdapter getSULAdapter() {`
`384`	`384`	`return sulAdapter;`
`385`	`385`	`}`
`386`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package se.uu.it.dtlsfuzzer.components.sul.core.config;`
`2`	`2`
`3`		`-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;`
	`3`	`+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;`
`4`	`4`
`5`		`-public interface TlsSulConfig extends SulConfig {`
	`5`	`+public interface TlsSulConfig extends SULConfig {`
`6`	`6`	`ConfigDelegate getConfigDelegate();`
`7`	`7`	`}`