diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java index b746e4d0..19861cc6 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java @@ -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 diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/AuthenticationConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/AuthenticationConfig.java index b0b9dc94..334580aa 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/AuthenticationConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/AuthenticationConfig.java @@ -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 diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/ManyFilesAuthenticationConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/ManyFilesAuthenticationConfig.java index 3abb866b..322e7f03 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/ManyFilesAuthenticationConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/ManyFilesAuthenticationConfig.java @@ -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 diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/TestVectorAuthenticationConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/TestVectorAuthenticationConfig.java index 4c0f7ff6..74d61b65 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/TestVectorAuthenticationConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/TestVectorAuthenticationConfig.java @@ -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); } } diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/Ed25519KeySigConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/Ed25519KeySigConfig.java index a80300ae..1f8a423d 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/Ed25519KeySigConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/Ed25519KeySigConfig.java @@ -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); } } diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/KeyConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/KeyConfig.java index ba01beb9..21ba03e7 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/KeyConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/KeyConfig.java @@ -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(); @@ -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()); - } } diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeySigConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeySigConfig.java index a3aa8e03..dbc0af16 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeySigConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeySigConfig.java @@ -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); } } diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeyStatConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeyStatConfig.java index c8168185..bc9e90fe 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeyStatConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/P256KeyStatConfig.java @@ -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); } } diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/X25519KeyStatConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/X25519KeyStatConfig.java index b538e727..6f8011be 100644 --- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/X25519KeyStatConfig.java +++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/authentication/keyconfigs/X25519KeyStatConfig.java @@ -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); } }