Merge master into isRequiredFix

Conflicts:
	TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactory.java

Author: ic0ns

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/Main.java

@@ -16,6 +16,7 @@
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
 import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import static de.rub.nds.tlsattacker.util.ConsoleLogger.CONSOLE;
+import java.util.Objects;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -137,9 +138,9 @@ public static void main(String[] args) {
             } else {
                 try {
                     Boolean result = attacker.checkVulnerability();
-                    if (result == Boolean.TRUE) {
+                    if (Objects.equals(result, Boolean.TRUE)) {
                         CONSOLE.error("Vulnerable:" + result.toString());
-                    } else if (result == Boolean.FALSE) {
+                    } else if (Objects.equals(result, Boolean.FALSE)) {
                         CONSOLE.info("Vulnerable:" + result.toString());
                     } else {
                         CONSOLE.warn("Vulnerable: Uncertain");

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/Config.java

@@ -315,7 +315,7 @@ public static Config createEmptyConfig() {
     /**
      * Default ALPN announced protocols
      */
-    private String[] alpnAnnouncedProtocols = new String[]{"h2"};
+    private String[] alpnAnnouncedProtocols = new String[] { "h2" };
 
     /**
      * Default SRP Identifier
@@ -764,7 +764,7 @@ public static Config createEmptyConfig() {
      * How much padding bytes should be send by default
      */
     @XmlJavaTypeAdapter(ByteArrayAdapter.class)
-    private byte[] defaultPaddingExtensionBytes = new byte[]{0, 0, 0, 0, 0, 0};
+    private byte[] defaultPaddingExtensionBytes = new byte[] { 0, 0, 0, 0, 0, 0 };
 
     /**
      * How long should our DTLSCookies be by default
@@ -2887,7 +2887,8 @@ public byte[] getEarlyData() {
     }
 
     /**
-     * @param earlyData the earlyData to set
+     * @param earlyData
+     *            the earlyData to set
      */
     public void setEarlyData(byte[] earlyData) {
         this.earlyData = earlyData;
@@ -2901,7 +2902,8 @@ public List<PskSet> getDefaultPskSets() {
     }
 
     /**
-     * @param defaultPskSets the defaultPskSets to set
+     * @param defaultPskSets
+     *            the defaultPskSets to set
      */
     public void setDefaultPskSets(List<PskSet> defaultPskSets) {
         this.defaultPskSets = defaultPskSets;
@@ -2915,7 +2917,8 @@ public byte[] getPsk() {
     }
 
     /**
-     * @param psk the psk to set
+     * @param psk
+     *            the psk to set
      */
     public void setPsk(byte[] psk) {
         this.psk = psk;
@@ -2929,7 +2932,8 @@ public byte[] getDefaultSessionTicketAgeAdd() {
     }
 
     /**
-     * @param defaultSessionTicketAgeAdd the defaultSessionTicketAgeAdd to set
+     * @param defaultSessionTicketAgeAdd
+     *            the defaultSessionTicketAgeAdd to set
      */
     public void setDefaultSessionTicketAgeAdd(byte[] defaultSessionTicketAgeAdd) {
         this.defaultSessionTicketAgeAdd = defaultSessionTicketAgeAdd;
@@ -2943,7 +2947,8 @@ public byte[] getDefaultSessionTicketNonce() {
     }
 
     /**
-     * @param defaultSessionTicketNonce the defaultSessionTicketNonce to set
+     * @param defaultSessionTicketNonce
+     *            the defaultSessionTicketNonce to set
      */
     public void setDefaultSessionTicketNonce(byte[] defaultSessionTicketNonce) {
         this.defaultSessionTicketNonce = defaultSessionTicketNonce;
@@ -2957,8 +2962,8 @@ public byte[] getDefaultSessionTicketIdentity() {
     }
 
     /**
-     * @param defaultSessionTicketIdentity the defaultSessionTicketIdentity to
-     * set
+     * @param defaultSessionTicketIdentity
+     *            the defaultSessionTicketIdentity to set
      */
     public void setDefaultSessionTicketIdentity(byte[] defaultSessionTicketIdentity) {
         this.defaultSessionTicketIdentity = defaultSessionTicketIdentity;
@@ -2972,7 +2977,8 @@ public byte[] getClientEarlyTrafficSecret() {
     }
 
     /**
-     * @param clientEarlyTrafficSecret the clientEarlyTrafficSecret to set
+     * @param clientEarlyTrafficSecret
+     *            the clientEarlyTrafficSecret to set
      */
     public void setClientEarlyTrafficSecret(byte[] clientEarlyTrafficSecret) {
         this.clientEarlyTrafficSecret = clientEarlyTrafficSecret;
@@ -2986,7 +2992,8 @@ public byte[] getEarlySecret() {
     }
 
     /**
-     * @param earlySecret the earlySecret to set
+     * @param earlySecret
+     *            the earlySecret to set
      */
     public void setEarlySecret(byte[] earlySecret) {
         this.earlySecret = earlySecret;
@@ -3000,7 +3007,8 @@ public CipherSuite getEarlyDataCipherSuite() {
     }
 
     /**
-     * @param earlyDataCipherSuite the earlyDataCipherSuite to set
+     * @param earlyDataCipherSuite
+     *            the earlyDataCipherSuite to set
      */
     public void setEarlyDataCipherSuite(CipherSuite earlyDataCipherSuite) {
         this.earlyDataCipherSuite = earlyDataCipherSuite;
@@ -3014,7 +3022,8 @@ public byte[] getEarlyDataPsk() {
     }
 
     /**
-     * @param earlyDataPsk the earlyDataPsk to set
+     * @param earlyDataPsk
+     *            the earlyDataPsk to set
      */
     public void setEarlyDataPsk(byte[] earlyDataPsk) {
         this.earlyDataPsk = earlyDataPsk;
@@ -3028,7 +3037,8 @@ public Boolean isUsePsk() {
     }
 
     /**
-     * @param usePsk the usePsk to set
+     * @param usePsk
+     *            the usePsk to set
      */
     public void setUsePsk(Boolean usePsk) {
         this.usePsk = usePsk;

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactory.java

@@ -57,6 +57,7 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -179,7 +180,7 @@ public WorkflowTrace createHelloWorkflow(AliasedConnection connection) {
         List<ProtocolMessage> messages = new LinkedList<>();
         messages.add(new ServerHelloMessage(config));
         if (config.getHighestProtocolVersion().isTLS13()) {
-            if (config.getTls13BackwardsCompatibilityMode() == Boolean.TRUE) {
+            if (Objects.equals(config.getTls13BackwardsCompatibilityMode(), Boolean.TRUE)) {
                 ChangeCipherSpecMessage ccs = new ChangeCipherSpecMessage();
                 ccs.setRequired(false);
                 messages.add(ccs);
@@ -862,7 +863,7 @@ private WorkflowTrace createDynamicHandshakeWorkflow() {
             messages.add(new ServerHelloMessage(config));
 
             if (config.getHighestProtocolVersion().isTLS13()) {
-                if (config.getTls13BackwardsCompatibilityMode() == Boolean.TRUE) {
+                if (Objects.equals(config.getTls13BackwardsCompatibilityMode(), Boolean.TRUE)) {
                     ChangeCipherSpecMessage ccs = new ChangeCipherSpecMessage();
                     ccs.setRequired(false);
                     messages.add(ccs);