Some minor adjustments for the upcoming release. Mainly renames

Author: ic0ns

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/AttackConfig.java

@@ -27,7 +27,7 @@ public boolean isSkipConnectionCheck() {
         return skipConnectionCheck;
     }
 
-    public void setSkipConnectionCheck(boolean withConnectiviyCheck) {
-        this.skipConnectionCheck = withConnectiviyCheck;
+    public void setSkipConnectionCheck(boolean skipConnectionCheck) {
+        this.skipConnectionCheck = skipConnectionCheck;
     }
 }

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/Attacker.java

@@ -37,6 +37,7 @@ public Attacker(AttConfig config) {
     }
 
     public void attack() {
+        LOGGER.debug("Attackign with: " + this.getClass().getSimpleName());
         if (!config.isSkipConnectionCheck()) {
             if (!canConnect()) {
                 LOGGER.log(LogLevel.CONSOLE_OUTPUT, "Cannot reach Server. Is the server online?");
@@ -47,6 +48,7 @@ public void attack() {
     }
 
     public Boolean checkVulnerability() {
+        LOGGER.debug("Checking: " + this.getClass().getSimpleName());
         if (!config.isSkipConnectionCheck()) {
             if (!canConnect()) {
                 LOGGER.log(LogLevel.CONSOLE_OUTPUT, "Cannot reach Server. Is the server online?");

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/BleichenbacherAttacker.java

@@ -98,8 +98,7 @@ private EqualityError isVulnerable(BleichenbacherWorkflowType bbWorkflowType, Li
         for (int i = 0; i < responseFingerprintList.size(); i++) {
             ResponseFingerprint fingerprint = responseFingerprintList.get(i);
             Pkcs1Vector pkcs1Vector = pkcs1Vectors.get(i);
-            LOGGER.debug("\n PKCS#1 vector: {}\n Fingerprint: {}", pkcs1Vector.getDescription(),
-                    fingerprint.toString());
+            LOGGER.debug("\n PKCS#1 vector: {}\n Fingerprint: {}", pkcs1Vector.getDescription(), fingerprint.toString());
         }
         ResponseFingerprint fingerprint = responseFingerprintList.get(0);
         for (int i = 1; i < responseFingerprintList.size(); i++) {

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/PaddingOracleAttacker.java

@@ -159,7 +159,6 @@ private byte[] createPaddingBytes(int padding) {
 
     @Override
     public Boolean isVulnerable() {
-        LOGGER.log(LogLevel.CONSOLE_OUTPUT, "Testing for PaddingOracle...");
         int macSize = AlgorithmResolver.getMacAlgorithm(tlsConfig.getDefaultSelectedProtocolVersion(),
                 tlsConfig.getDefaultSelectedCipherSuite()).getSize();
         int blockSize = AlgorithmResolver.getCipher(tlsConfig.getDefaultSelectedCipherSuite())
@@ -194,8 +193,8 @@ public Boolean isVulnerable() {
 
         }
         LOGGER.log(LogLevel.CONSOLE_OUTPUT,
-                "A server is considered vulnerable to this attack if he responds differently to these testvectors.");
-        LOGGER.log(LogLevel.CONSOLE_OUTPUT, "A server is considered not vulnerable if he always responds the same way.");
+                "A server is considered vulnerable to this attack if it responds differently to the test vectors.");
+        LOGGER.log(LogLevel.CONSOLE_OUTPUT, "A server is considered secure if it always responds the same way.");
 
         for (List<ResponseFingerprint> list : responseMap.values()) {
             ResponseFingerprint fingerprint = list.get(0);

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/PskBruteForcerAttackClient.java

@@ -131,7 +131,7 @@ private void executeProtocolFlowToClient() {
                 try {
                     decryptor.decrypt(trace.getReceivingActions().get(1).getReceivedRecords().get(2));
                 } catch (CryptoException E) {
-                    LOGGER.info("neeeeeeeeeeeeein");
+                    E.printStackTrace();
                 }
 
             } catch (NoSuchAlgorithmException ex) {

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/PskBruteForcerAttackServer.java

@@ -111,7 +111,7 @@ public Boolean isVulnerable() {
             LOGGER.log(LogLevel.CONSOLE_OUTPUT, "Vulnerable (probably), Server uses PSK");
             return true;
         } else {
-            LOGGER.log(LogLevel.CONSOLE_OUTPUT, "Not Vulnerable (probably), Server not uses PSK");
+            LOGGER.log(LogLevel.CONSOLE_OUTPUT, "Not Vulnerable (probably), Server does not use PSK");
             return false;
         }
     }

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/WinshockAttacker.java

@@ -25,8 +25,6 @@
 import de.rub.nds.tlsattacker.core.workflow.WorkflowTraceUtil;
 import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowConfigurationFactory;
 import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Allows to execute the Winshock attack, by setting the CertificateVerify

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/FiniteFieldGroups.java

@@ -13,11 +13,11 @@
  * @author Robert Merget <robert.merget@rub.de>
  */
 public enum FiniteFieldGroups {
-    ffdhe2048(new byte[] { 01, 00 }),
-    ffdhe3072(new byte[] { 01, 01 }),
-    ffdhe4096(new byte[] { 01, 02 }),
-    ffdhe6144(new byte[] { 01, 03 }),
-    ffdhe8192(new byte[] { 01, 04 });
+    FFDHE2048(new byte[] { 01, 00 }),
+    FFDHE3072(new byte[] { 01, 01 }),
+    FFDHE4096(new byte[] { 01, 02 }),
+    FFDHE6144(new byte[] { 01, 03 }),
+    FFDHE8192(new byte[] { 01, 04 });
 
     private final byte[] value;