diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java index 70fa9734d6..058552669b 100644 --- a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java +++ b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java @@ -8,17 +8,38 @@ */ package de.rub.nds.tlsattacker.core.config; +import de.rub.nds.modifiablevariable.util.XMLPrettyPrinter; import de.rub.nds.tlsattacker.core.config.filter.ConfigDisplayFilter; import java.io.*; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.bind.JAXB; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactoryConfigurationException; +import org.xml.sax.SAXException; public class ConfigIO { + public static void write(Config config, File f) { - JAXB.marshal(config, f); + try { + write(config, new FileOutputStream(f)); + } catch (FileNotFoundException ex) { + throw new RuntimeException(ex); + } } public static void write(Config config, OutputStream os) { - JAXB.marshal(config, os); + ByteArrayOutputStream tempStream = new ByteArrayOutputStream(); + + JAXB.marshal(config, tempStream); + try { + os.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes()); + } catch (IOException | TransformerException | XPathExpressionException | XPathFactoryConfigurationException + | ParserConfigurationException | SAXException ex) { + throw new RuntimeException("Could not format XML"); + } } public static void write(Config config, File f, ConfigDisplayFilter filter) { diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializer.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializer.java index 0c4072d3ad..b178edd886 100644 --- a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializer.java +++ b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializer.java @@ -11,6 +11,7 @@ import de.rub.nds.modifiablevariable.ModifiableVariable; import de.rub.nds.modifiablevariable.ModificationFilter; import de.rub.nds.modifiablevariable.VariableModification; +import de.rub.nds.modifiablevariable.util.XMLPrettyPrinter; import de.rub.nds.tlsattacker.core.protocol.message.ProtocolMessage; import de.rub.nds.tlsattacker.core.protocol.message.extension.ExtensionMessage; import de.rub.nds.tlsattacker.core.workflow.action.ReceiveAction; @@ -26,15 +27,22 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactoryConfigurationException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.xml.sax.SAXException; public class WorkflowTraceSerializer { @@ -107,8 +115,16 @@ public static void write(OutputStream outputStream, WorkflowTrace workflowTrace) context = getJAXBContext(); Marshaller m = context.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); - - m.marshal(workflowTrace, outputStream); + ByteArrayOutputStream tempStream = new ByteArrayOutputStream(); + + m.marshal(workflowTrace, tempStream); + try { + outputStream.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes()); + } catch (TransformerException | XPathExpressionException | XPathFactoryConfigurationException + | ParserConfigurationException | SAXException ex) { + throw new RuntimeException("Could not format XML"); + } + tempStream.close(); outputStream.close(); } diff --git a/TLS-Core/src/main/resources/default_config.xml b/TLS-Core/src/main/resources/default_config.xml index 327c0a61fa..9cd0319036 100644 --- a/TLS-Core/src/main/resources/default_config.xml +++ b/TLS-Core/src/main/resources/default_config.xml @@ -1,4 +1,3 @@ - DEFAULT false @@ -691,40 +690,40 @@ ECDH_X25519 -2A 98 1D B6 CD D0 2A 06 C1 76 31 02 C9 E7 41 36 -5A C4 E6 F7 2B 31 76 A6 BD 6A 35 23 D3 EC 0F 4C - + 2A 98 1D B6 CD D0 2A 06 C1 76 31 02 C9 E7 41 36 + 5A C4 E6 F7 2B 31 76 A6 BD 6A 35 23 D3 EC 0F 4C + ECDH_X25519 -2A 98 1D B6 CD D0 2A 06 C1 76 31 02 C9 E7 41 36 -5A C4 E6 F7 2B 31 76 A6 BD 6A 35 23 D3 EC 0F 4C - + 2A 98 1D B6 CD D0 2A 06 C1 76 31 02 C9 E7 41 36 + 5A C4 E6 F7 2B 31 76 A6 BD 6A 35 23 D3 EC 0F 4C + localhost HOST_NAME false TWO_9 - - - - + + + + DRAFT_13 ECDSAP256 RSA2048_PKCS1_5 RSA2048_PSS OCSP - - + + h2 - + 55 73 65 72 4E 61 6D 65 SRTP_AES128_CM_HMAC_SHA1_80 SRTP_AES128_CM_HMAC_SHA1_32 SRTP_NULL_HMAC_SHA1_80 SRTP_NULL_HMAC_SHA1_32 - + UPN_DOMAIN_HINT OPEN_PGP X509 @@ -786,203 +785,203 @@ true PSK_KE PSK_DHE_KE - + -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + TLS_AES_128_GCM_SHA256 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + false 54 4C 53 2D 41 74 74 61 63 6B 65 72 0A -00 03 97 00 03 94 30 82 03 90 30 82 02 78 A0 03 -02 01 02 02 09 00 A6 50 C0 07 94 04 9F CD 30 0D -06 09 2A 86 48 86 F7 0D 01 01 0B 05 00 30 5C 31 -0B 30 09 06 03 55 04 06 13 02 41 55 31 13 30 11 -06 03 55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 -65 31 21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 -72 6E 65 74 20 57 69 64 67 69 74 73 20 50 74 79 -20 4C 74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 -4C 53 2D 41 74 74 61 63 6B 65 72 30 20 17 0D 31 -37 30 37 31 33 31 32 35 33 31 38 5A 18 0F 32 31 -31 37 30 36 31 39 31 32 35 33 31 38 5A 30 5C 31 -0B 30 09 06 03 55 04 06 13 02 41 55 31 13 30 11 -06 03 55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 -65 31 21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 -72 6E 65 74 20 57 69 64 67 69 74 73 20 50 74 79 -20 4C 74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 -4C 53 2D 41 74 74 61 63 6B 65 72 30 82 01 22 30 -0D 06 09 2A 86 48 86 F7 0D 01 01 01 05 00 03 82 -01 0F 00 30 82 01 0A 02 82 01 01 00 C8 82 0D 6C -3C E8 4C 84 30 F6 83 5A BF C7 D7 A9 12 E1 66 4F -44 57 87 51 F3 76 50 1A 8C 68 47 6C 30 72 D9 19 -C5 D3 9B D0 DB E0 80 E7 1D B8 3B D4 AB 2F 2F 9B -DE 3D FF B0 08 0F 51 0A 5F 69 29 C1 96 55 1F 2B -3C 36 9B E0 51 05 4C 87 75 73 19 55 58 FD 28 20 -35 93 4D C8 6E DA B8 D4 B1 B7 F5 55 E5 B2 FE E7 -27 53 84 A7 56 EF 86 CB 86 79 3B 5D 13 33 F0 97 -32 03 CB 96 96 67 66 E6 55 CD 2C CC AE 19 40 E4 -49 4B 8E 9F B5 27 95 93 B7 5A FD 0B 37 82 43 E5 -1A 88 F6 EB 88 DE F5 22 A8 CD 5C 6C 08 22 86 A0 -42 69 A2 87 97 60 FC BA 45 00 5D 7F 26 72 DD 22 -88 09 D4 72 74 F0 FE 0E A5 53 1C 2B D9 53 66 C0 -5B F6 9E DC 0F 3C 31 89 86 6E DC A0 C5 7A DC CA -93 25 0A E7 8D 9E AC A0 39 3A 95 FF 99 52 FC 47 -FB 76 79 DD 38 03 E6 A7 A6 FA 77 18 61 E3 D9 9E -4B 55 1A 40 84 66 8B 11 1B 7E EF 7D 02 03 01 00 -01 A3 53 30 51 30 1D 06 03 55 1D 0E 04 16 04 14 -E7 A9 2F E5 54 3A EE 2F F7 59 2F 80 0A C6 E6 65 -41 E3 26 8B 30 1F 06 03 55 1D 23 04 18 30 16 80 -14 E7 A9 2F E5 54 3A EE 2F F7 59 2F 80 0A C6 E6 -65 41 E3 26 8B 30 0F 06 03 55 1D 13 01 01 FF 04 -05 30 03 01 01 FF 30 0D 06 09 2A 86 48 86 F7 0D -01 01 0B 05 00 03 82 01 01 00 0D 5C 11 E2 8C F1 -9D 1B C1 7E 4F F5 43 69 51 68 57 0A A7 DB 85 B3 -EC B8 54 05 39 2A 0E DA FE 4F 09 7E E4 68 5B 72 -85 E3 D9 B8 69 D2 32 57 16 1C A6 5E 20 B5 E6 A5 -85 D3 3D A5 CD 65 3A F8 12 43 31 81 32 C9 F6 4A -47 6E C0 8B A8 04 86 B3 E4 39 F7 65 63 5A 7E A8 -A9 69 B3 AB D8 65 00 36 D7 4C 5F C4 A0 45 89 E9 -AC 8D C3 BE 27 08 74 3A 6C FE 3B 45 1E 37 40 F7 -35 F1 56 D6 DC 7F FC 8A 2C 85 2C D4 E3 97 B9 42 -46 1C 2F CA 88 4C 7A FB 7E BE F7 91 8D 6A AE F1 -F0 D2 57 E9 59 75 4C 46 65 77 9F A0 E3 25 3E F2 -BE DB BD 5B E5 DA 60 0A 0A 68 E5 1D 2D 1C 12 5C -4E 19 86 69 A6 BC 71 5E 8F 38 84 E9 C3 EF F3 9D -40 83 8A DA 4B 1F 38 31 3F 62 86 AA 39 5D C6 DE -A9 DA F4 93 96 CF 12 EC 47 EF A7 A0 D3 88 2F 8B -84 D9 AE EF FB 25 2C 6B 81 A5 66 60 96 05 FB FD -3F 0D 17 E5 B1 24 01 49 2A 1A - + 00 03 97 00 03 94 30 82 03 90 30 82 02 78 A0 03 + 02 01 02 02 09 00 A6 50 C0 07 94 04 9F CD 30 0D + 06 09 2A 86 48 86 F7 0D 01 01 0B 05 00 30 5C 31 + 0B 30 09 06 03 55 04 06 13 02 41 55 31 13 30 11 + 06 03 55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 + 65 31 21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 + 72 6E 65 74 20 57 69 64 67 69 74 73 20 50 74 79 + 20 4C 74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 + 4C 53 2D 41 74 74 61 63 6B 65 72 30 20 17 0D 31 + 37 30 37 31 33 31 32 35 33 31 38 5A 18 0F 32 31 + 31 37 30 36 31 39 31 32 35 33 31 38 5A 30 5C 31 + 0B 30 09 06 03 55 04 06 13 02 41 55 31 13 30 11 + 06 03 55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 + 65 31 21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 + 72 6E 65 74 20 57 69 64 67 69 74 73 20 50 74 79 + 20 4C 74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 + 4C 53 2D 41 74 74 61 63 6B 65 72 30 82 01 22 30 + 0D 06 09 2A 86 48 86 F7 0D 01 01 01 05 00 03 82 + 01 0F 00 30 82 01 0A 02 82 01 01 00 C8 82 0D 6C + 3C E8 4C 84 30 F6 83 5A BF C7 D7 A9 12 E1 66 4F + 44 57 87 51 F3 76 50 1A 8C 68 47 6C 30 72 D9 19 + C5 D3 9B D0 DB E0 80 E7 1D B8 3B D4 AB 2F 2F 9B + DE 3D FF B0 08 0F 51 0A 5F 69 29 C1 96 55 1F 2B + 3C 36 9B E0 51 05 4C 87 75 73 19 55 58 FD 28 20 + 35 93 4D C8 6E DA B8 D4 B1 B7 F5 55 E5 B2 FE E7 + 27 53 84 A7 56 EF 86 CB 86 79 3B 5D 13 33 F0 97 + 32 03 CB 96 96 67 66 E6 55 CD 2C CC AE 19 40 E4 + 49 4B 8E 9F B5 27 95 93 B7 5A FD 0B 37 82 43 E5 + 1A 88 F6 EB 88 DE F5 22 A8 CD 5C 6C 08 22 86 A0 + 42 69 A2 87 97 60 FC BA 45 00 5D 7F 26 72 DD 22 + 88 09 D4 72 74 F0 FE 0E A5 53 1C 2B D9 53 66 C0 + 5B F6 9E DC 0F 3C 31 89 86 6E DC A0 C5 7A DC CA + 93 25 0A E7 8D 9E AC A0 39 3A 95 FF 99 52 FC 47 + FB 76 79 DD 38 03 E6 A7 A6 FA 77 18 61 E3 D9 9E + 4B 55 1A 40 84 66 8B 11 1B 7E EF 7D 02 03 01 00 + 01 A3 53 30 51 30 1D 06 03 55 1D 0E 04 16 04 14 + E7 A9 2F E5 54 3A EE 2F F7 59 2F 80 0A C6 E6 65 + 41 E3 26 8B 30 1F 06 03 55 1D 23 04 18 30 16 80 + 14 E7 A9 2F E5 54 3A EE 2F F7 59 2F 80 0A C6 E6 + 65 41 E3 26 8B 30 0F 06 03 55 1D 13 01 01 FF 04 + 05 30 03 01 01 FF 30 0D 06 09 2A 86 48 86 F7 0D + 01 01 0B 05 00 03 82 01 01 00 0D 5C 11 E2 8C F1 + 9D 1B C1 7E 4F F5 43 69 51 68 57 0A A7 DB 85 B3 + EC B8 54 05 39 2A 0E DA FE 4F 09 7E E4 68 5B 72 + 85 E3 D9 B8 69 D2 32 57 16 1C A6 5E 20 B5 E6 A5 + 85 D3 3D A5 CD 65 3A F8 12 43 31 81 32 C9 F6 4A + 47 6E C0 8B A8 04 86 B3 E4 39 F7 65 63 5A 7E A8 + A9 69 B3 AB D8 65 00 36 D7 4C 5F C4 A0 45 89 E9 + AC 8D C3 BE 27 08 74 3A 6C FE 3B 45 1E 37 40 F7 + 35 F1 56 D6 DC 7F FC 8A 2C 85 2C D4 E3 97 B9 42 + 46 1C 2F CA 88 4C 7A FB 7E BE F7 91 8D 6A AE F1 + F0 D2 57 E9 59 75 4C 46 65 77 9F A0 E3 25 3E F2 + BE DB BD 5B E5 DA 60 0A 0A 68 E5 1D 2D 1C 12 5C + 4E 19 86 69 A6 BC 71 5E 8F 38 84 E9 C3 EF F3 9D + 40 83 8A DA 4B 1F 38 31 3F 62 86 AA 39 5D C6 DE + A9 DA F4 93 96 CF 12 EC 47 EF A7 A0 D3 88 2F 8B + 84 D9 AE EF FB 25 2C 6B 81 A5 66 60 96 05 FB FD + 3F 0D 17 E5 B1 24 01 49 2A 1A + -00 03 54 00 03 51 30 82 03 4D 30 82 03 0A A0 03 -02 01 02 02 09 00 83 71 F0 10 46 D4 0E 48 30 0B -06 09 60 86 48 01 65 03 04 03 02 30 5C 31 0B 30 -09 06 03 55 04 06 13 02 44 45 31 13 30 11 06 03 -55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 65 31 -21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 72 6E -65 74 20 57 69 64 67 69 74 73 20 50 74 79 20 4C -74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 4C 53 -2D 41 74 74 61 63 6B 65 72 30 20 17 0D 31 37 30 -37 31 33 31 32 30 38 31 37 5A 18 0F 32 31 31 37 -30 36 31 39 31 32 30 38 31 37 5A 30 5C 31 0B 30 -09 06 03 55 04 06 13 02 44 45 31 13 30 11 06 03 -55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 65 31 -21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 72 6E -65 74 20 57 69 64 67 69 74 73 20 50 74 79 20 4C -74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 4C 53 -2D 41 74 74 61 63 6B 65 72 30 82 01 B6 30 82 01 -2B 06 07 2A 86 48 CE 38 04 01 30 82 01 1E 02 81 -81 00 A6 B0 EA F2 CC E3 B4 37 0D 66 CD 94 AA 68 -E4 25 DF 90 B6 89 36 92 4D 7A 2B 19 17 3D 5F DD -C3 A9 E5 69 E9 14 CB 5C 02 8E 6D D3 1D E7 12 7C -E1 45 27 08 E7 8A 88 83 FA 86 65 9F 0E 47 73 DD -CB 6D 52 92 06 CA B1 9C 1F 66 FB 9D 3A 11 E3 36 -A8 AA 28 A2 4B 2D 64 B0 E5 09 6E 58 60 C2 D5 F8 -89 95 81 33 A1 49 A8 25 6A DC 7A 2E F7 F6 1F 54 -5B 04 35 28 34 C0 EE 45 5D 25 6A A6 FB 88 8C B8 -7F D5 02 15 00 FF 03 35 3A B8 57 DD A6 1F 28 23 -EE 73 42 53 E8 D4 D3 5C 3D 02 81 80 17 0B 66 A0 -5C 36 44 89 91 97 FE 9E 3F F2 61 16 B9 07 B3 E8 -E9 0F A3 CF E6 4D 2E 7E B4 3D 21 9C EE 46 EF 34 -2E 0C 03 46 11 76 FA F1 44 D6 09 B9 52 01 FE EF -46 20 27 B9 32 81 53 75 B5 11 AB F8 E0 04 88 86 -D9 E2 0F AD C5 D8 EF 9A B5 CA EF CB 3F F6 67 CA -95 3A 53 F8 2E 0F F3 01 D9 23 CA C9 22 EE 37 35 -B2 31 D4 01 77 EC 9A D8 27 99 80 18 C9 03 9B E6 -3B 06 7E 9A F0 6C 9B 7D 50 11 CA 82 03 81 84 00 -02 81 80 4A 37 26 DC C3 29 99 45 FC F9 32 C1 27 -01 10 1C 94 89 26 56 0F 3E 33 B8 C6 70 89 08 B5 -A8 8C 0B DD DB A2 F2 4E C6 72 BA 61 F6 F4 96 80 -FB 90 0F 99 F0 1C 3A 08 E0 0D 48 F8 5F C2 39 CF -14 F6 EE E3 FD B0 DB 6C 88 BC 89 B9 8F C1 22 79 -3A F8 F1 D9 26 58 70 C0 0E EF 42 D1 EE 1A CB 5F -B3 87 4A 6C AF F4 E4 4F 82 2E 2E B3 65 46 1C 0A -F3 84 B9 92 5F FB 56 14 53 C5 BE 55 54 C8 6F 20 -CE C0 DC A3 53 30 51 30 1D 06 03 55 1D 0E 04 16 -04 14 9B 1C 1B 88 4A E8 69 05 71 A0 FA BC 67 B4 -45 E7 77 79 EC 0D 30 1F 06 03 55 1D 23 04 18 30 -16 80 14 9B 1C 1B 88 4A E8 69 05 71 A0 FA BC 67 -B4 45 E7 77 79 EC 0D 30 0F 06 03 55 1D 13 01 01 -FF 04 05 30 03 01 01 FF 30 0B 06 09 60 86 48 01 -65 03 04 03 02 03 30 00 30 2D 02 14 12 B6 19 CE -0D CC AE F0 9F 8B B0 AC BF D1 46 30 0C 0C 1B 00 -02 15 00 BD E6 CB 6C F9 00 58 B5 33 D0 50 54 2E -24 BA 1F 64 86 02 26 - + 00 03 54 00 03 51 30 82 03 4D 30 82 03 0A A0 03 + 02 01 02 02 09 00 83 71 F0 10 46 D4 0E 48 30 0B + 06 09 60 86 48 01 65 03 04 03 02 30 5C 31 0B 30 + 09 06 03 55 04 06 13 02 44 45 31 13 30 11 06 03 + 55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 65 31 + 21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 72 6E + 65 74 20 57 69 64 67 69 74 73 20 50 74 79 20 4C + 74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 4C 53 + 2D 41 74 74 61 63 6B 65 72 30 20 17 0D 31 37 30 + 37 31 33 31 32 30 38 31 37 5A 18 0F 32 31 31 37 + 30 36 31 39 31 32 30 38 31 37 5A 30 5C 31 0B 30 + 09 06 03 55 04 06 13 02 44 45 31 13 30 11 06 03 + 55 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 65 31 + 21 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 72 6E + 65 74 20 57 69 64 67 69 74 73 20 50 74 79 20 4C + 74 64 31 15 30 13 06 03 55 04 03 0C 0C 54 4C 53 + 2D 41 74 74 61 63 6B 65 72 30 82 01 B6 30 82 01 + 2B 06 07 2A 86 48 CE 38 04 01 30 82 01 1E 02 81 + 81 00 A6 B0 EA F2 CC E3 B4 37 0D 66 CD 94 AA 68 + E4 25 DF 90 B6 89 36 92 4D 7A 2B 19 17 3D 5F DD + C3 A9 E5 69 E9 14 CB 5C 02 8E 6D D3 1D E7 12 7C + E1 45 27 08 E7 8A 88 83 FA 86 65 9F 0E 47 73 DD + CB 6D 52 92 06 CA B1 9C 1F 66 FB 9D 3A 11 E3 36 + A8 AA 28 A2 4B 2D 64 B0 E5 09 6E 58 60 C2 D5 F8 + 89 95 81 33 A1 49 A8 25 6A DC 7A 2E F7 F6 1F 54 + 5B 04 35 28 34 C0 EE 45 5D 25 6A A6 FB 88 8C B8 + 7F D5 02 15 00 FF 03 35 3A B8 57 DD A6 1F 28 23 + EE 73 42 53 E8 D4 D3 5C 3D 02 81 80 17 0B 66 A0 + 5C 36 44 89 91 97 FE 9E 3F F2 61 16 B9 07 B3 E8 + E9 0F A3 CF E6 4D 2E 7E B4 3D 21 9C EE 46 EF 34 + 2E 0C 03 46 11 76 FA F1 44 D6 09 B9 52 01 FE EF + 46 20 27 B9 32 81 53 75 B5 11 AB F8 E0 04 88 86 + D9 E2 0F AD C5 D8 EF 9A B5 CA EF CB 3F F6 67 CA + 95 3A 53 F8 2E 0F F3 01 D9 23 CA C9 22 EE 37 35 + B2 31 D4 01 77 EC 9A D8 27 99 80 18 C9 03 9B E6 + 3B 06 7E 9A F0 6C 9B 7D 50 11 CA 82 03 81 84 00 + 02 81 80 4A 37 26 DC C3 29 99 45 FC F9 32 C1 27 + 01 10 1C 94 89 26 56 0F 3E 33 B8 C6 70 89 08 B5 + A8 8C 0B DD DB A2 F2 4E C6 72 BA 61 F6 F4 96 80 + FB 90 0F 99 F0 1C 3A 08 E0 0D 48 F8 5F C2 39 CF + 14 F6 EE E3 FD B0 DB 6C 88 BC 89 B9 8F C1 22 79 + 3A F8 F1 D9 26 58 70 C0 0E EF 42 D1 EE 1A CB 5F + B3 87 4A 6C AF F4 E4 4F 82 2E 2E B3 65 46 1C 0A + F3 84 B9 92 5F FB 56 14 53 C5 BE 55 54 C8 6F 20 + CE C0 DC A3 53 30 51 30 1D 06 03 55 1D 0E 04 16 + 04 14 9B 1C 1B 88 4A E8 69 05 71 A0 FA BC 67 B4 + 45 E7 77 79 EC 0D 30 1F 06 03 55 1D 23 04 18 30 + 16 80 14 9B 1C 1B 88 4A E8 69 05 71 A0 FA BC 67 + B4 45 E7 77 79 EC 0D 30 0F 06 03 55 1D 13 01 01 + FF 04 05 30 03 01 01 FF 30 0B 06 09 60 86 48 01 + 65 03 04 03 02 03 30 00 30 2D 02 14 12 B6 19 CE + 0D CC AE F0 9F 8B B0 AC BF D1 46 30 0C 0C 1B 00 + 02 15 00 BD E6 CB 6C F9 00 58 B5 33 D0 50 54 2E + 24 BA 1F 64 86 02 26 + -00 01 BD 00 01 BA 30 82 01 B6 30 82 01 6C A0 03 -02 01 02 02 09 00 B9 FB 5B 9B 7B 19 C2 11 30 0A -06 08 2A 86 48 CE 3D 04 03 02 30 45 31 0B 30 09 -06 03 55 04 06 13 02 44 45 31 13 30 11 06 03 55 -04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 65 31 21 -30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 72 6E 65 -74 20 57 69 64 67 69 74 73 20 50 74 79 20 4C 74 -64 30 20 17 0D 31 37 30 37 31 33 31 32 35 35 30 -37 5A 18 0F 32 31 31 37 30 36 31 39 31 32 35 35 -30 37 5A 30 45 31 0B 30 09 06 03 55 04 06 13 02 -44 45 31 13 30 11 06 03 55 04 08 0C 0A 53 6F 6D -65 2D 53 74 61 74 65 31 21 30 1F 06 03 55 04 0A -0C 18 49 6E 74 65 72 6E 65 74 20 57 69 64 67 69 -74 73 20 50 74 79 20 4C 74 64 30 49 30 13 06 07 -2A 86 48 CE 3D 02 01 06 08 2A 86 48 CE 3D 03 01 -01 03 32 00 04 DF 64 72 34 F3 75 CB 38 13 7C 67 -75 B0 4A 40 95 0C 93 2E 18 06 20 71 7F 80 2B 21 -FE 86 84 79 98 7D 99 03 83 D9 08 E1 9B 68 3F 41 -2E CD F3 97 E1 A3 53 30 51 30 1D 06 03 55 1D 0E -04 16 04 14 AC F9 05 11 E6 91 01 8C 1B 69 17 7A -F7 43 32 14 86 EE 09 D5 30 1F 06 03 55 1D 23 04 -18 30 16 80 14 AC F9 05 11 E6 91 01 8C 1B 69 17 -7A F7 43 32 14 86 EE 09 D5 30 0F 06 03 55 1D 13 -01 01 FF 04 05 30 03 01 01 FF 30 0A 06 08 2A 86 -48 CE 3D 04 03 02 03 38 00 30 35 02 19 00 9E 8F -2E 5C 4D 6C 41 79 B6 0E 12 B4 6B 7A D1 9F 7A F3 -9F 11 73 1A 35 97 02 18 0C DC 38 7E 4A 12 F6 BB -EE 70 2A 05 B5 48 C5 F5 FC 2D E3 84 2B 63 66 A0 - - + 00 01 BD 00 01 BA 30 82 01 B6 30 82 01 6C A0 03 + 02 01 02 02 09 00 B9 FB 5B 9B 7B 19 C2 11 30 0A + 06 08 2A 86 48 CE 3D 04 03 02 30 45 31 0B 30 09 + 06 03 55 04 06 13 02 44 45 31 13 30 11 06 03 55 + 04 08 0C 0A 53 6F 6D 65 2D 53 74 61 74 65 31 21 + 30 1F 06 03 55 04 0A 0C 18 49 6E 74 65 72 6E 65 + 74 20 57 69 64 67 69 74 73 20 50 74 79 20 4C 74 + 64 30 20 17 0D 31 37 30 37 31 33 31 32 35 35 30 + 37 5A 18 0F 32 31 31 37 30 36 31 39 31 32 35 35 + 30 37 5A 30 45 31 0B 30 09 06 03 55 04 06 13 02 + 44 45 31 13 30 11 06 03 55 04 08 0C 0A 53 6F 6D + 65 2D 53 74 61 74 65 31 21 30 1F 06 03 55 04 0A + 0C 18 49 6E 74 65 72 6E 65 74 20 57 69 64 67 69 + 74 73 20 50 74 79 20 4C 74 64 30 49 30 13 06 07 + 2A 86 48 CE 3D 02 01 06 08 2A 86 48 CE 3D 03 01 + 01 03 32 00 04 DF 64 72 34 F3 75 CB 38 13 7C 67 + 75 B0 4A 40 95 0C 93 2E 18 06 20 71 7F 80 2B 21 + FE 86 84 79 98 7D 99 03 83 D9 08 E1 9B 68 3F 41 + 2E CD F3 97 E1 A3 53 30 51 30 1D 06 03 55 1D 0E + 04 16 04 14 AC F9 05 11 E6 91 01 8C 1B 69 17 7A + F7 43 32 14 86 EE 09 D5 30 1F 06 03 55 1D 23 04 + 18 30 16 80 14 AC F9 05 11 E6 91 01 8C 1B 69 17 + 7A F7 43 32 14 86 EE 09 D5 30 0F 06 03 55 1D 13 + 01 01 FF 04 05 30 03 01 01 FF 30 0A 06 08 2A 86 + 48 CE 3D 04 03 02 03 38 00 30 35 02 19 00 9E 8F + 2E 5C 4D 6C 41 79 B6 0E 12 B4 6B 7A D1 9F 7A F3 + 9F 11 73 1A 35 97 02 18 0C DC 38 7E 4A 12 F6 BB + EE 70 2A 05 B5 48 C5 F5 FC 2D E3 84 2B 63 66 A0 + + false false false @@ -1031,15 +1030,15 @@ EE 70 2A 05 B5 48 C5 F5 FC 2D E3 84 2B 63 66 A0 PEER_ALLOWED_TO_SEND NULL NULL - - - - - - + + + + + + NULL - - + + TLS_PRF_LEGACY 0 0 @@ -1062,7 +1061,7 @@ EE 70 2A 05 B5 48 C5 F5 FC 2D E3 84 2B 63 66 A0 15874858421354831201422373086128612745111153124913833804748747602178280564406425154617488927847142136837462790351481317765255581632968169400556456985418488827925888221598273953686611745401672309465708043217648197631331184971921491765473252248751361737713587292004390571935209364268173007740802648762007661253254661694353602685239350183219876383969245059520622897526828073822681994419744648185400986499062312630392385618231497966730037670361639244062483305891646041343885072158127929403028249239589737831073084456798375448844113695963693837622356344855176327289719518978665114515326513514352049909912072269175924872321 1A 2B 3C 4D 43 6C 69 65 6E 74 5F 49 64 65 6E 74 69 74 79 - + 167609434410335061345139523764350090260135525329813904557420930309800865859473551531551523800013916573891864789934747039010546328480848979516637673776605610374669426214776197828492691384519453218253702788022233205683635831626913357154941914129985489522629902540768368409482248290641036967659389658897350067939 5809605995369958062791915965639201402176612226902900533702900882779736177890990861472094774477339581147373410185646378328043729800750470098210924487866935059164371588168047540943981644516632755067501626434556398193186628990071248660819361205119793693985433297036118232914410171876807536457391277857011849897410207519105333355801121109356897459426271845471397952675959440793493071628394122780510124618488232602464649876850458861245784240929258426287699705312584509625419513463605155428017165714465363094021609290561084025893662561222573202082865797821865270991145082200656978177192827024538990239969175546190770645685893438011714430426409338676314743571154537142031573004276428701433036381801705308659830751190352946025482059931306571004727362479688415574702596946457770284148435989129632853918392117997472632693078113129886487399347796982772784615865232621289656944284216824611318709764535152507354116344703769998514148343807 2 @@ -1077,21 +1076,21 @@ EE 70 2A 05 B5 48 C5 F5 FC 2D E3 84 2B 63 66 A0 55 73 65 72 4E 61 6D 65 50 61 73 73 77 6F 72 64 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + PROVIDED_TOKEN_BINDING 65537 89489425009274444368228545921773093919669586065884257445497854456487674839629818390934941973262879616797970608917283679875499331574161113854088813275488110588247193077582527278437906504015680623423550067240042466665654232383502922215493623289472138866445818789127946123407807725702626644091036502372545139713 @@ -1104,28 +1103,28 @@ EE 70 2A 05 B5 48 C5 F5 FC 2D E3 84 2B 63 66 A0 NONE 0 -53 65 63 75 72 65 53 54 69 63 6B 65 74 4B 65 79 + 53 65 63 75 72 65 53 54 69 63 6B 65 74 4B 6 -53 65 63 75 72 65 53 54 69 63 6B 65 74 4B 65 79 -53 65 63 75 72 65 53 54 69 63 6B 65 74 4B 65 79 - + 53 65 63 75 72 65 53 54 69 63 6B 65 74 4B 65 79 + 53 65 63 75 72 65 53 54 69 63 6B 65 74 4B 65 79 + -54 4C 53 2D 41 74 74 61 63 6B 65 72 20 4B 65 79 + 54 4C 53 2D 41 74 74 61 63 6B 65 72 20 4B 6 CB 8D BE 8E 00 -52 66 D2 1A BE 0F 51 56 10 6E B1 F0 EC 54 A4 8A -90 FB C1 36 DE 99 0A 88 81 19 22 11 CC 83 AA 79 -92 CE B6 7D 7A 40 B3 F3 04 FD EA 87 E4 CA 61 04 -2C 19 64 1F D7 49 39 75 EC 69 A3 EC 3F 5F B6 40 -4A A4 AC 5A CD 5E FB EA 15 D4 54 D8 98 88 A4 6F -C4 E6 C6 B9 A3 E0 EE 08 EA 21 53 83 72 CE D8 D0 -AC A4 53 CE AE 44 CE 37 2A 53 88 AB 4C EF 67 C5 -EA E8 CC 1C 72 73 5D 26 46 C1 9B 2C 50 A4 EE 9B -C9 7E 70 C6 B5 7C AB 27 6A 11 A5 9F C5 CB E0 F5 -D2 51 9E 16 4F BF 9F 07 A9 DD 05 3B CF C0 89 39 -B4 75 C7 A2 E7 6F 04 EF 2A 06 CC 96 72 BD 40 34 - + 52 66 D2 1A BE 0F 51 56 10 6E B1 F0 EC 54 A4 8A + 90 FB C1 36 DE 99 0A 88 81 19 22 11 CC 83 AA 79 + 92 CE B6 7D 7A 40 B3 F3 04 FD EA 87 E4 CA 61 04 + 2C 19 64 1F D7 49 39 75 EC 69 A3 EC 3F 5F B6 40 + 4A A4 AC 5A CD 5E FB EA 15 D4 54 D8 98 88 A4 6F + C4 E6 C6 B9 A3 E0 EE 08 EA 21 53 83 72 CE D8 D0 + AC A4 53 CE AE 44 CE 37 2A 53 88 AB 4C EF 67 C5 + EA E8 CC 1C 72 73 5D 26 46 C1 9B 2C 50 A4 EE 9B + C9 7E 70 C6 B5 7C AB 27 6A 11 A5 9F C5 CB E0 F5 + D2 51 9E 16 4F BF 9F 07 A9 DD 05 3B CF C0 89 39 + B4 75 C7 A2 E7 6F 04 EF 2A 06 CC 96 72 BD 40 34 + ANONYMOUS true diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializerTest.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializerTest.java index ebaa35a247..72672f5e93 100644 --- a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializerTest.java +++ b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializerTest.java @@ -121,7 +121,7 @@ public void serializeWithSingleConnectionTest() { action = new SendAction(new ClientHelloMessage(config)); trace.addTlsAction(action); - StringBuilder sb = new StringBuilder("\n"); + StringBuilder sb = new StringBuilder(); sb.append("\n"); sb.append(" \n"); sb.append(" \n"); @@ -164,7 +164,7 @@ public void serializeWithSingleCustomConnectionTest() { action.setConnectionAlias(con.getAlias()); trace.addTlsAction(action); - StringBuilder sb = new StringBuilder("\n"); + StringBuilder sb = new StringBuilder(""); sb.append("\n"); sb.append(" \n"); sb.append(" theAlias\n"); @@ -214,7 +214,7 @@ public void serializeWithMultipleCustomConnectionTest() { action = new SendAction(con3.getAlias(), new ClientHelloMessage(config)); trace.addTlsAction(action); - StringBuilder sb = new StringBuilder("\n"); + StringBuilder sb = new StringBuilder(""); sb.append("\n"); sb.append(" \n"); sb.append(" alias1\n"); diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ActionTestUtils.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ActionTestUtils.java index 2194772fde..683f9e22a1 100644 --- a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ActionTestUtils.java +++ b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ActionTestUtils.java @@ -83,7 +83,7 @@ public static void marshalingEmptyActionYieldsMinimalOutpu logger.warn("The action under test does not follow naming convention. " + xmlName + " does not end with string 'Action'"); } - StringBuilder sb = new StringBuilder("\n"); + StringBuilder sb = new StringBuilder(""); sb.append("\n"); sb.append(" <").append(xmlName).append("/>\n"); sb.append("\n"); diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ForwardActionTest.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ForwardActionTest.java index 56d7bfab9e..74e82ab1ae 100644 --- a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ForwardActionTest.java +++ b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ForwardActionTest.java @@ -146,7 +146,7 @@ public void marshalingEmptyActionYieldsMinimalOutput() { try { action = new ForwardAction(ctx1Alias, ctx2Alias); trace.addTlsAction(action); - StringBuilder sb = new StringBuilder("\n"); + StringBuilder sb = new StringBuilder(""); sb.append("\n"); sb.append(" \n"); sb.append(" ctx1\n"); diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-0.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-0.xml index b44bdd5006..18a4560458 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-0.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-0.xml @@ -1,15 +1,12 @@ # Given this config: - # And this input trace - # We expect this normalized trace - client @@ -21,5 +18,4 @@ # And this after default filter application: - diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-1.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-1.xml index 553859de1c..73a4318ac0 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-1.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-1.xml @@ -1,10 +1,8 @@ # Given this config: - # And this input trace - @@ -14,7 +12,6 @@ # We expect this normalized trace - client @@ -33,11 +30,10 @@ # And this after default filter application: - - \ No newline at end of file + diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml index 5d611a578e..883797aa09 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml @@ -1,5 +1,4 @@ # Given this config: - CLIENT @@ -19,12 +18,10 @@ # And this input trace - # We expect this normalized trace - client @@ -36,5 +33,4 @@ # And this after default filter application: - diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-3.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-3.xml index 917c48262a..dddcb3ed76 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-3.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-3.xml @@ -1,5 +1,4 @@ # Given this config: - CLIENT @@ -19,7 +18,6 @@ # And this input trace - @@ -29,7 +27,6 @@ # We expect this normalized trace - client @@ -48,7 +45,6 @@ # And this after default filter application: - diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-4.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-4.xml index b79de8b73a..0ee07bc94c 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-4.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-4.xml @@ -2,12 +2,10 @@ Test that user default connections that are explicitly overwritten in the workflow trace are not overwritten by noramlizing and filtering. # Given this config: - # And this input trace - client @@ -16,7 +14,6 @@ workflow trace are not overwritten by noramlizing and filtering. # We expect this normalized trace - client @@ -28,7 +25,6 @@ workflow trace are not overwritten by noramlizing and filtering. # And this after default filter application: - client diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-5.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-5.xml index 18edb63d5e..455dc46cec 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-5.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-5.xml @@ -1,12 +1,10 @@ Test custom connection in workflow trace # Given this config: - # And this input trace - custom @@ -15,7 +13,6 @@ Test custom connection in workflow trace # We expect this normalized trace - custom @@ -27,7 +24,6 @@ Test custom connection in workflow trace # And this after default filter application: - custom diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-6.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-6.xml index 0670c334f9..9b3f05e9a1 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-6.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-6.xml @@ -1,10 +1,8 @@ # Given this config: - # And this input trace - 44 @@ -17,7 +15,6 @@ # We expect this normalized trace - client @@ -36,7 +33,6 @@ # And this after default filter application: - 44 @@ -46,4 +42,4 @@ - \ No newline at end of file + diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-7.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-7.xml index cc292eda66..657dbde58a 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-7.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-7.xml @@ -3,12 +3,10 @@ if there is only one connection defined in the workflow trace. This is true for default and custom connections. # Given this config: - # And this input trace - custom @@ -22,7 +20,6 @@ true for default and custom connections. # We expect this normalized trace - custom @@ -41,7 +38,6 @@ true for default and custom connections. # And this after default filter application: - custom @@ -52,4 +48,4 @@ true for default and custom connections. - \ No newline at end of file + diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml index c0358237bf..b41459d00f 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml @@ -2,12 +2,10 @@ This test illustrates that connection aliases are removed from actions if there is only one connection defined in the workflow trace. # Given this config: - # And this input trace - client @@ -20,7 +18,6 @@ if there is only one connection defined in the workflow trace. # We expect this normalized trace - client @@ -39,7 +36,6 @@ if there is only one connection defined in the workflow trace. # And this after default filter application: - client @@ -49,4 +45,4 @@ if there is only one connection defined in the workflow trace. - \ No newline at end of file + diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml index c1463cf665..d6e78acfd1 100644 --- a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml +++ b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml @@ -1,13 +1,11 @@ Test a MITM workflow trace # Given this config: - MITM # And this input trace - server @@ -84,7 +82,6 @@ Test a MITM workflow trace # We expect this normalized trace - server @@ -178,7 +175,6 @@ Test a MITM workflow trace # And this after default filter application: - server @@ -251,4 +247,4 @@ Test a MITM workflow trace server US_ASCII - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index e598e963a8..3e3a8cef66 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ de.rub.nds ModifiableVariable - 2.2 + 2.3 org.reflections