Skip to content

Refine run description #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
actyp merged 2 commits into from
Jun 3, 2026
Merged

Refine run description #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d235499
Refine run description format
actyp Mar 26, 2026
fa53d7a
Use PSF methods for run description printing
actyp Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions ...om/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,25 +243,25 @@ protected byte[] parseHexString(String hexString) {
public void printRunDescriptionSelf(PrintWriter printWriter) {
super.printRunDescriptionSelf(printWriter);
printWriter.println();
printWriter.println("EdhocMapperConfig Parameters");
printWriter.println("Protocol Version: " + getProtocolVersion());
printWriter.println("Combined Message Version: " + getCombinedMessageVersion());
printWriter.println("Edhoc Role: " + edhocRole);
printWriter.println("Edhoc Coap Resource: " + getEdhocCoapResource());
printWriter.println("App Coap Resource: " + getAppCoapResource());
printWriter.println("App Message Code To Coap Server: " + getAppMessageCodeToCoapServer());
printWriter.println("App Message Payload To Coap Server: " + getAppMessagePayloadToCoapServer());
printWriter.println("App Message Code To Coap Client: " + getAppMessageCodeToCoapClient());
printWriter.println("App Message Payload To Coap Client: " + getAppMessagePayloadToCoapClient());
printWriter.println("Coap Error As Edhoc Error: " + isCoapErrorAsEdhocError());
printWriter.println("use Content Format: " + useContentFormat());
printWriter.println("use Old Content Format: " + useOldContentFormat());
printWriter.println("use Session Reset: " + useSessionReset());
printWriter.println("use CX Correlation: " + useCXCorrelation());
printWriter.println("Own Connection Id: " + this.ownConnectionId);
printWriter.println("Generate Own Connection Id: " + generateOwnConnectionId());
printWriter.println("Force Oscore Sender Id: " + this.forceOscoreSenderId);
printWriter.println("Force Oscore Recipient Id: " + this.forceOscoreRecipientId);
printWriter.println("### EdhocMapperConfig Parameters");
printRDParam(printWriter, "-protocolVersion", protocolVersion);
printRDParam(printWriter, "-combinedMessageVersion", combinedMessageVersion);
printRDParam(printWriter, "-edhocRole", edhocRole);
printRDStringParam(printWriter, "-edhocCoapResource", edhocCoapResource);
printRDStringParam(printWriter, "-appCoapResource", appCoapResource);
printRDStringParam(printWriter, "-appMessageCodeToCoapServer", appMessageCodeToCoapServer);
printRDStringParam(printWriter, "-appMessagePayloadToCoapServer", appMessagePayloadToCoapServer);
printRDStringParam(printWriter, "-appMessageCodeToCoapClient", appMessageCodeToCoapClient);
printRDStringParam(printWriter, "-appMessagePayloadToCoapClient", appMessagePayloadToCoapClient);
printRDBooleanParam(printWriter, "-coapErrorAsEdhocError", coapErrorAsEdhocError);
printRDBooleanParam(printWriter, "-disableContentFormat", disableContentFormat);
printRDBooleanParam(printWriter, "-useOldContentFormat", useOldContentFormat);
printRDBooleanParam(printWriter, "-enableSessionReset", enableSessionReset);
printRDBooleanParam(printWriter, "-disableCXCorrelation", disableCXCorrelation);
printRDStringParam(printWriter, "-ownConnectionId", ownConnectionId);
printRDBooleanParam(printWriter, "-disableOwnConnectionIdGeneration", disableOwnConnectionIdGeneration);
printRDStringParam(printWriter, "-forceOscoreSenderId", forceOscoreSenderId);
printRDStringParam(printWriter, "-forceOscoreRecipientId", forceOscoreRecipientId);
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions ...fuzzing/edhocfuzzer/components/sul/mapper/config/authentication/AuthenticationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ public TestVectorAuthenticationConfig getTestVectorAuthenticationConfig() {

@Override
public void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("AuthenticationConfig Parameters");
printWriter.println("Map Cred Type: " + mapCredType);
printWriter.println("Map Id Cred Type: " + mapIdCredType);
printWriter.println("Sul Cred Type: " + sulCredType);
printWriter.println("Sul Id Cred Type: " + sulIdCredType);
printWriter.println("Trust Model: " + trustModel);
printWriter.println("### AuthenticationConfig Parameters");
printRDParam(printWriter, "-mapCredType", mapCredType);
printRDParam(printWriter, "-mapIdCredType", mapIdCredType);
printRDParam(printWriter, "-sulCredType", sulCredType);
printRDParam(printWriter, "-sulIdCredType", sulIdCredType);
printRDParam(printWriter, "-trustModel", trustModel);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...dhocfuzzer/components/sul/mapper/config/authentication/ManyFilesAuthenticationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public boolean isUsed() {

@Override
public void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("ManyFilesAuthenticationConfig Parameters");
printWriter.println("Map Authentication Method" + mapAuthenticationMethod);
printWriter.println("Map Supported Cipher Suites" + mapSupportedCipherSuites);
printWriter.println("### ManyFilesAuthenticationConfig Parameters");
printRDParam(printWriter, "-mapAuthenticationMethod", mapAuthenticationMethod);
printRDListParam(printWriter, "-mapSupportedCipherSuites", mapSupportedCipherSuites);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...hocfuzzer/components/sul/mapper/config/authentication/TestVectorAuthenticationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ private TestVector jsonFile2TestVector(String filename, String key) {

@Override
public void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("TestVectorAuthenticationConfig Parameters");
printWriter.println("Test Vector File: " + getTestVectorFile());
printWriter.println("Test Vector Key: " + getTestVectorKey());
printWriter.println("Test Vector Peer Key Curve: " + getTestVectorPeerKeyCurve());
printWriter.println("### TestVectorAuthenticationConfig Parameters");
printRDStringParam(printWriter, "-testVectorJson", testVectorFile);
printRDStringParam(printWriter, "-testVectorJsonKey", testVectorJsonKey);
printRDStringParam(printWriter, "-testVectorPeerKeyCurve", testVectorPeerKeyCurve);
}
}
12 changes: 10 additions & 2 deletions ...hocfuzzer/components/sul/mapper/config/authentication/keyconfigs/Ed25519KeySigConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ public String getSulX5uLink() {

@Override
public void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("Ed25519KeySigConfig Parameters");
KeyConfig.super.printRunDescriptionSelf(printWriter);
printWriter.println("### Ed25519KeySigConfig Parameters");
printRDStringParam(printWriter, "-mapEd25519PrivKeySig", mapPrivateFilename);
printRDStringParam(printWriter, "-mapEd25519PubKeySig", mapPublicFilename);
printRDStringParam(printWriter, "-mapEd25519KidSig", mapKid);
printRDStringParam(printWriter, "-mapEd25519X509CertSig", mapX509Filename);
printRDStringParam(printWriter, "-mapEd25519X5uLinkSig", mapX5uLink);
printRDStringParam(printWriter, "-sulEd25519PubKeySig", sulPublicFilename);
printRDStringParam(printWriter, "-sulEd25519KidSig", sulKid);
printRDStringParam(printWriter, "-sulEd25519X509CertSig", sulX509Filename);
printRDStringParam(printWriter, "-sulEd25519X5uLinkSig", sulX5uLink);
}
}
15 changes: 0 additions & 15 deletions ...fuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/KeyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.statistics.RunDescriptionPrinter;

import java.io.PrintWriter;
import java.util.Arrays;

public interface KeyConfig extends RunDescriptionPrinter {
public String getMapPrivateFilename();
Expand All @@ -23,17 +21,4 @@ public interface KeyConfig extends RunDescriptionPrinter {
public String getSulX509Filename();

public String getSulX5uLink();

@Override
default void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("Map Private Filename: " + getMapPrivateFilename());
printWriter.println("Map Public Filename: " + getMapPublicFilename());
printWriter.println("Map Kid: " + Arrays.toString(getMapKid()));
printWriter.println("Map X509 Filename: " + getMapX509Filename());
printWriter.println("Map X5u Link: " + getMapX5uLink());
printWriter.println("Sul Public Filename: " + getSulPublicFilename());
printWriter.println("Sul Kid: " + Arrays.toString(getSulKid()));
printWriter.println("Sul X509 Filename: " + getSulX509Filename());
printWriter.println("Sul X5u Link: " + getSulX5uLink());
}
}
12 changes: 10 additions & 2 deletions .../edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeySigConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ public String getSulX5uLink() {

@Override
public void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("P256KeySigConfig Parameters");
KeyConfig.super.printRunDescriptionSelf(printWriter);
printWriter.println("### P256KeySigConfig Parameters");
printRDStringParam(printWriter, "-mapP256PrivKeySig", mapPrivateFilename);
printRDStringParam(printWriter, "-mapP256PubKeySig", mapPublicFilename);
printRDStringParam(printWriter, "-mapP256KidSig", mapKid);
printRDStringParam(printWriter, "-mapP256X509CertSig", mapX509Filename);
printRDStringParam(printWriter, "-mapP256X5uLinkSig", mapX5uLink);
printRDStringParam(printWriter, "-sulP256PubKeySig", sulPublicFilename);
printRDStringParam(printWriter, "-sulP256KidSig", sulKid);
printRDStringParam(printWriter, "-sulP256X509CertSig", sulX509Filename);
printRDStringParam(printWriter, "-sulP256X5uLinkSig", sulX5uLink);
}
}
12 changes: 10 additions & 2 deletions ...edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeyStatConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ public String getSulX5uLink() {

@Override
public void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("P256KeyStatConfig Parameters");
KeyConfig.super.printRunDescriptionSelf(printWriter);
printWriter.println("### P256KeyStatConfig Parameters");
printRDStringParam(printWriter, "-mapP256PrivKeyStat", mapPrivateFilename);
printRDStringParam(printWriter, "-mapP256PubKeyStat", mapPublicFilename);
printRDStringParam(printWriter, "-mapP256KidStat", mapKid);
printRDStringParam(printWriter, "-mapP256X509CertStat", mapX509Filename);
printRDStringParam(printWriter, "-mapP256X5uLinkStat", mapX5uLink);
printRDStringParam(printWriter, "-sulP256PubKeyStat", sulPublicFilename);
printRDStringParam(printWriter, "-sulP256KidStat", sulKid);
printRDStringParam(printWriter, "-sulP256X509CertStat", sulX509Filename);
printRDStringParam(printWriter, "-sulP256X5uLinkStat", sulX5uLink);
}
}
12 changes: 10 additions & 2 deletions ...hocfuzzer/components/sul/mapper/config/authentication/keyconfigs/X25519KeyStatConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,15 @@ public String getSulX5uLink() {

@Override
public void printRunDescriptionSelf(PrintWriter printWriter) {
printWriter.println("X25519KeyStatConfig Parameters");
KeyConfig.super.printRunDescriptionSelf(printWriter);
printWriter.println("### X25519KeyStatConfig Parameters");
printRDStringParam(printWriter, "-mapX25519PrivKeyStat", mapPrivateFilename);
printRDStringParam(printWriter, "-mapX25519PubKeyStat", mapPublicFilename);
printRDStringParam(printWriter, "-mapX25519KidStat", mapKid);
printRDStringParam(printWriter, "-mapX25519X509CertStat", mapX509Filename);
printRDStringParam(printWriter, "-mapX25519X5uLinkStat", mapX5uLink);
printRDStringParam(printWriter, "-sulX25519PubKeyStat", sulPublicFilename);
printRDStringParam(printWriter, "-sulX25519KidStat", sulKid);
printRDStringParam(printWriter, "-sulX25519X509CertStat", sulX509Filename);
printRDStringParam(printWriter, "-sulX25519X5uLinkStat", sulX5uLink);
}
}
Loading