Added vulnerability detection before attack exection to get the oracle type.

Performed minor modifications

Author: jurajsomorovsky

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

@@ -45,7 +45,7 @@ public class BleichenbacherCommandConfig extends AttackConfig {
             + "FULL results in a comprehensive server evaluation.")
     private Type type = Type.FAST;
     @Parameter(names = "-msgPkcsConform", description = "Used by the real Bleichenbacher attack. Indicates whether the original "
-            + "message that we are going to decrypt is PKCS#1 conform or not (more precisely, whether it starts with 0x00 0x02.", arity = 1)
+            + "message that we are going to decrypt is PKCS#1 conform or not (more precisely, whether it starts with 0x00 0x02).", arity = 1)
     private boolean msgPkcsConform = true;
 
     public BleichenbacherCommandConfig(GeneralDelegate delegate) {

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

@@ -65,8 +65,7 @@ public State executeTlsFlow(BleichenbacherWorkflowType type, byte[] encryptedPMS
 
     @Override
     public Boolean isVulnerable() {
-        RSAPublicKey publicKey;
-        publicKey = (RSAPublicKey) CertificateFetcher.fetchServerPublicKey(tlsConfig);
+        RSAPublicKey publicKey = (RSAPublicKey) CertificateFetcher.fetchServerPublicKey(tlsConfig);
         if (publicKey == null) {
             LOGGER.info("Could not retrieve PublicKey from Server - is the Server running?");
             return null;
@@ -149,8 +148,16 @@ private ResponseFingerprint getFingerprint(BleichenbacherWorkflowType type, byte
 
     @Override
     public void executeAttack() {
-        RSAPublicKey publicKey;
-        publicKey = (RSAPublicKey) CertificateFetcher.fetchServerPublicKey(tlsConfig);
+        // needs to execute the isVulnerable method to configure the workflow
+        // type
+        boolean vulnerable = isVulnerable();
+        LOGGER.info("Using the following oracle type: {}", vulnerableType);
+
+        if (!vulnerable) {
+            LOGGER.warn("The server is not vulnerable to the Bleichenbacher attack");
+            return;
+        }
+        RSAPublicKey publicKey = (RSAPublicKey) CertificateFetcher.fetchServerPublicKey(tlsConfig);
         if (publicKey == null) {
             LOGGER.info("Could not retrieve PublicKey from Server - is the Server running?");
             return;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/pkcs1/VectorFingerprintPair.java

@@ -10,10 +10,6 @@
 
 import de.rub.nds.tlsattacker.attacks.util.response.ResponseFingerprint;
 
-/**
- *
- * @author Robert Merget - robert.merget@rub.de
- */
 public class VectorFingerprintPair {
 
     private ResponseFingerprint fingerprint;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/pkcs1/oracles/RealDirectMessagePkcs1Oracle.java

@@ -8,8 +8,6 @@
  */
 package de.rub.nds.tlsattacker.attacks.pkcs1.oracles;
 
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
-import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
 import de.rub.nds.tlsattacker.attacks.config.AttackConfig;
 import de.rub.nds.tlsattacker.attacks.pkcs1.BleichenbacherWorkflowGenerator;
 import de.rub.nds.tlsattacker.attacks.pkcs1.BleichenbacherWorkflowType;
@@ -18,31 +16,25 @@
 import de.rub.nds.tlsattacker.attacks.util.response.ResponseExtractor;
 import de.rub.nds.tlsattacker.attacks.util.response.ResponseFingerprint;
 import de.rub.nds.tlsattacker.core.config.Config;
-import de.rub.nds.tlsattacker.core.constants.HandshakeMessageType;
-import de.rub.nds.tlsattacker.core.constants.RunningModeType;
 import de.rub.nds.tlsattacker.core.exceptions.WorkflowExecutionException;
-import de.rub.nds.tlsattacker.core.protocol.message.RSAClientKeyExchangeMessage;
 import de.rub.nds.tlsattacker.core.state.State;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutor;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutorFactory;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowTrace;
-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 de.rub.nds.tlsattacker.util.MathHelper;
 import java.io.IOException;
 import java.security.PublicKey;
 import java.security.interfaces.RSAPublicKey;
 
 public class RealDirectMessagePkcs1Oracle extends Pkcs1Oracle {
 
-    private AttackConfig attackConfig;
+    private final AttackConfig attackConfig;
 
     private final ResponseFingerprint validResponseContent;
 
     private final ResponseFingerprint invalidResponseContent;
 
-    private BleichenbacherWorkflowType type;
+    private final BleichenbacherWorkflowType type;
 
     public RealDirectMessagePkcs1Oracle(PublicKey pubKey, AttackConfig config,
             ResponseFingerprint validResponseContent, ResponseFingerprint invalidResponseContent,
@@ -85,7 +77,7 @@ public boolean checkPKCSConformity(final byte[] msg) {
             }
 
         } catch (WorkflowExecutionException e) {
-            e.printStackTrace();
+            LOGGER.debug(e.getLocalizedMessage(), e);
         }
         return conform;
     }
@@ -95,7 +87,7 @@ private ResponseFingerprint getFingerprint(State state) {
             ResponseFingerprint fingerprint = ResponseExtractor.getFingerprint(state);
             return fingerprint;
         } else {
-            LOGGER.warn("Could not execute Workflow. Something went wrong... Check the debug output for more information");
+            LOGGER.debug("Could not execute Workflow. Something went wrong... Check the debug output for more information");
         }
         return null;
     }