Merge pull request #75 from daMatz/master

ic0ns · web-flow · commit 1cad0a2e9277 · 2020-07-27T17:06:47.000+02:00
Bleichenbacher: Add null check for errorType
diff --git a/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/BleichenbacherAttacker.java b/Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/BleichenbacherAttacker.java
@@ -107,7 +107,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;
         }

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public State executeTlsFlow(BleichenbacherWorkflowType type, byte[] encryptedPMS`
`107`	`107`	`@Override`
`108`	`108`	`public Boolean isVulnerable() {`
`109`	`109`	`errorType = getEqualityError();`
`110`		`- if (errorType != EqualityError.NONE) {`
	`110`	`+ if (errorType != null && errorType != EqualityError.NONE) {`
`111`	`111`	`vulnerableType = config.getWorkflowType();`
`112`	`112`	`return true;`
`113`	`113`	`}`