Skip to content

Commit ce46745

Browse files
authored
Merge pull request #84 from RUB-NDS/invalidCurveEval
Invalid Curve Probe
2 parents c39507f + 85cc7ef commit ce46745

39 files changed

+2668
-742
lines changed

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/TlsScanner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import de.rub.nds.tlsattacker.core.constants.StarttlsType;
1414
import de.rub.nds.tlsattacker.core.workflow.NamedThreadFactory;
1515
import de.rub.nds.tlsattacker.core.workflow.ParallelExecutor;
16-
import de.rub.nds.tlsscanner.probe.EsniProbe;
16+
import de.rub.nds.tlsscanner.serverscanner.probe.EsniProbe;
1717
import de.rub.nds.tlsscanner.serverscanner.config.ScannerConfig;
1818
import de.rub.nds.tlsscanner.serverscanner.probe.*;
1919
import de.rub.nds.tlsscanner.serverscanner.report.SiteReport;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/**
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker.
3+
*
4+
* Copyright 2017-2019 Ruhr University Bochum / Hackmanit GmbH
5+
*
6+
* Licensed under Apache License 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*/
9+
10+
package de.rub.nds.tlsscanner.serverscanner.leak.info;
11+
12+
import de.rub.nds.tlsscanner.serverscanner.probe.invalidCurve.InvalidCurveVector;
13+
14+
public class InvalidCurveTestInfo extends TestInfo {
15+
16+
private final InvalidCurveVector vector;
17+
18+
public InvalidCurveTestInfo(InvalidCurveVector vector) {
19+
this.vector = vector;
20+
}
21+
22+
@Override
23+
public String getTechnicalName() {
24+
return getVector().toString();
25+
}
26+
27+
@Override
28+
public String getPrintableName() {
29+
return getVector().toString();
30+
}
31+
32+
@Override
33+
public boolean equals(Object o) {
34+
if (o instanceof InvalidCurveTestInfo) {
35+
InvalidCurveTestInfo other = (InvalidCurveTestInfo) o;
36+
return other.getVector().equals(vector);
37+
}
38+
return false;
39+
}
40+
41+
@Override
42+
public int hashCode() {
43+
int hashCode = 7;
44+
hashCode *= getVector().hashCode();
45+
return hashCode;
46+
}
47+
48+
public InvalidCurveVector getVector() {
49+
return vector;
50+
}
51+
52+
}

0 commit comments

Comments
 (0)