Merge pull request #662 from RUB-NDS/publicMaster

Public master

Author: ic0ns

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

@@ -109,7 +109,7 @@ public State executeTlsFlow(BleichenbacherWorkflowType type, byte[] encryptedPMS
     @Override
     public Boolean isVulnerable() {
         errorType = getEqualityError();
-        if (errorType != EqualityError.NONE) {
+        if (errorType != null && errorType != EqualityError.NONE) {
             vulnerableType = config.getWorkflowType();
             return true;
         }

pom.xml

@@ -78,16 +78,6 @@
             <artifactId>dnsjava</artifactId>
             <version>2.1.8</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.9.0</version>
-        </dependency>
         <dependency>
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>