Skip to content

Commit ef0eae0

Browse files
authored
Merge pull request #611 from RUB-NDS/equalsFix
Fixed ==/equals comparision
2 parents dccbc81 + 4837a9d commit ef0eae0

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/Main.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
1717
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
1818
import static de.rub.nds.tlsattacker.util.ConsoleLogger.CONSOLE;
19+
import java.util.Objects;
1920
import org.apache.logging.log4j.LogManager;
2021
import org.apache.logging.log4j.Logger;
2122

@@ -137,9 +138,9 @@ public static void main(String[] args) {
137138
} else {
138139
try {
139140
Boolean result = attacker.checkVulnerability();
140-
if (result == Boolean.TRUE) {
141+
if (Objects.equals(result, Boolean.TRUE)) {
141142
CONSOLE.error("Vulnerable:" + result.toString());
142-
} else if (result == Boolean.FALSE) {
143+
} else if (Objects.equals(result, Boolean.FALSE)) {
143144
CONSOLE.info("Vulnerable:" + result.toString());
144145
} else {
145146
CONSOLE.warn("Vulnerable: Uncertain");

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import java.util.ArrayList;
5858
import java.util.LinkedList;
5959
import java.util.List;
60+
import java.util.Objects;
6061
import org.apache.logging.log4j.LogManager;
6162
import org.apache.logging.log4j.Logger;
6263

@@ -179,7 +180,7 @@ public WorkflowTrace createHelloWorkflow(AliasedConnection connection) {
179180
List<ProtocolMessage> messages = new LinkedList<>();
180181
messages.add(new ServerHelloMessage(config));
181182
if (config.getHighestProtocolVersion().isTLS13()) {
182-
if (config.getTls13BackwardsCompatibilityMode() == Boolean.TRUE) {
183+
if (Objects.equals(config.getTls13BackwardsCompatibilityMode(), Boolean.TRUE)) {
183184
messages.add(new ChangeCipherSpecMessage());
184185
}
185186
messages.add(new EncryptedExtensionsMessage(config));
@@ -860,7 +861,7 @@ private WorkflowTrace createDynamicHandshakeWorkflow() {
860861
messages.add(new ServerHelloMessage(config));
861862

862863
if (config.getHighestProtocolVersion().isTLS13()) {
863-
if (config.getTls13BackwardsCompatibilityMode() == Boolean.TRUE) {
864+
if (Objects.equals(config.getTls13BackwardsCompatibilityMode(), Boolean.TRUE)) {
864865
messages.add(new ChangeCipherSpecMessage());
865866
}
866867
messages.add(new EncryptedExtensionsMessage(config));

0 commit comments

Comments
 (0)