Skip to content

Commit 01f2445

Browse files
committed
bleichenbacher vectors are now generate by the bleichenbacher attacker and not the scanner
1 parent aee1f28 commit 01f2445

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/main/java/de/rub/nds/tlsscanner/probe/BleichenbacherProbe.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,17 @@ public ProbeResult executeTest() {
5959
LOGGER.info("Fetched the following server public key: " + publicKey);
6060
List<Pkcs1Vector> pkcs1Vectors;
6161
if (scannerConfig.getScanDetail().isGreaterEqualTo(ScannerDetail.DETAILED)) {
62-
pkcs1Vectors = Pkcs1VectorGenerator.generatePkcs1Vectors(publicKey, BleichenbacherCommandConfig.Type.FULL,
63-
bleichenbacherConfig.createConfig().getDefaultHighestClientProtocolVersion());
64-
62+
bleichenbacherConfig.setType(BleichenbacherCommandConfig.Type.FULL);
6563
} else {
66-
pkcs1Vectors = Pkcs1VectorGenerator.generatePkcs1Vectors(publicKey, BleichenbacherCommandConfig.Type.FAST,
67-
bleichenbacherConfig.createConfig().getDefaultHighestClientProtocolVersion());
64+
bleichenbacherConfig.setType(BleichenbacherCommandConfig.Type.FAST);
6865
}
6966
List<BleichenbacherTestResult> resultList = new LinkedList<>();
7067
boolean vulnerable = false;
7168
for (BleichenbacherWorkflowType bbWorkflowType : BleichenbacherWorkflowType.values()) {
69+
bleichenbacherConfig.setWorkflowType(bbWorkflowType);
7270
LOGGER.debug("Testing: " + bbWorkflowType);
7371
BleichenbacherAttacker attacker = new BleichenbacherAttacker(bleichenbacherConfig, scannerConfig.createConfig(), getParallelExecutor());
74-
EqualityError errorType = attacker.isVulnerable(bbWorkflowType, pkcs1Vectors);
72+
EqualityError errorType = attacker.getEqualityError();
7573
vulnerable |= (errorType != EqualityError.NONE);
7674
resultList.add(new BleichenbacherTestResult(errorType != EqualityError.NONE, bleichenbacherConfig.getType(), bbWorkflowType, attacker.getFingerprintPairList(), errorType));
7775
}

0 commit comments

Comments
 (0)