Skip to content

Commit 2ad2a32

Browse files
authored
Merge pull request #135 from tls-attacker/probeListFix
Added addProbeToProbeList back to TlsScanner
2 parents 306bfe4 + 8cbaffe commit 2ad2a32

File tree

1 file changed

+35
-35
lines changed
  • TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner

1 file changed

+35
-35
lines changed

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

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -83,41 +83,41 @@ public TlsScanner(ScannerConfig config, ParallelExecutor parallelExecutor, List<
8383

8484
private void fillDefaultProbeLists() {
8585

86-
probeList.add(new CommonBugProbe(config, parallelExecutor));
87-
probeList.add(new SniProbe(config, parallelExecutor));
88-
probeList.add(new CompressionsProbe(config, parallelExecutor));
89-
probeList.add(new NamedCurvesProbe(config, parallelExecutor));
90-
probeList.add(new AlpnProbe(config, parallelExecutor));
91-
probeList.add(new AlpacaProbe(config, parallelExecutor));
92-
probeList.add(new CertificateProbe(config, parallelExecutor));
93-
probeList.add(new OcspProbe(config, parallelExecutor));
94-
probeList.add(new ProtocolVersionProbe(config, parallelExecutor));
95-
probeList.add(new CipherSuiteProbe(config, parallelExecutor));
96-
probeList.add(new DirectRaccoonProbe(config, parallelExecutor));
97-
probeList.add(new CipherSuiteOrderProbe(config, parallelExecutor));
98-
probeList.add(new ExtensionProbe(config, parallelExecutor));
99-
probeList.add(new TokenbindingProbe(config, parallelExecutor));
100-
probeList.add(new HttpHeaderProbe(config, parallelExecutor));
101-
probeList.add(new HttpFalseStartProbe(config, parallelExecutor));
102-
probeList.add(new ECPointFormatProbe(config, parallelExecutor));
103-
probeList.add(new ResumptionProbe(config, parallelExecutor));
104-
probeList.add(new RenegotiationProbe(config, parallelExecutor));
105-
probeList.add(new SessionTicketZeroKeyProbe(config, parallelExecutor));
106-
probeList.add(new HeartbleedProbe(config, parallelExecutor));
107-
probeList.add(new PaddingOracleProbe(config, parallelExecutor));
108-
probeList.add(new BleichenbacherProbe(config, parallelExecutor));
109-
probeList.add(new TlsPoodleProbe(config, parallelExecutor));
110-
probeList.add(new InvalidCurveProbe(config, parallelExecutor));
111-
probeList.add(new DrownProbe(config, parallelExecutor));
112-
probeList.add(new EarlyCcsProbe(config, parallelExecutor));
113-
// probeList.add(new MacProbe(config, parallelExecutor));
114-
probeList.add(new CcaSupportProbe(config, parallelExecutor));
115-
probeList.add(new CcaRequiredProbe(config, parallelExecutor));
116-
probeList.add(new CcaProbe(config, parallelExecutor));
117-
probeList.add(new EsniProbe(config, parallelExecutor));
118-
probeList.add(new CertificateTransparencyProbe(config, parallelExecutor));
119-
probeList.add(new RecordFragmentationProbe(config, parallelExecutor));
120-
probeList.add(new HelloRetryProbe(config, parallelExecutor));
86+
addProbeToProbeList(new CommonBugProbe(config, parallelExecutor));
87+
addProbeToProbeList(new SniProbe(config, parallelExecutor));
88+
addProbeToProbeList(new CompressionsProbe(config, parallelExecutor));
89+
addProbeToProbeList(new NamedCurvesProbe(config, parallelExecutor));
90+
addProbeToProbeList(new AlpnProbe(config, parallelExecutor));
91+
addProbeToProbeList(new AlpacaProbe(config, parallelExecutor));
92+
addProbeToProbeList(new CertificateProbe(config, parallelExecutor));
93+
addProbeToProbeList(new OcspProbe(config, parallelExecutor));
94+
addProbeToProbeList(new ProtocolVersionProbe(config, parallelExecutor));
95+
addProbeToProbeList(new CipherSuiteProbe(config, parallelExecutor));
96+
addProbeToProbeList(new DirectRaccoonProbe(config, parallelExecutor));
97+
addProbeToProbeList(new CipherSuiteOrderProbe(config, parallelExecutor));
98+
addProbeToProbeList(new ExtensionProbe(config, parallelExecutor));
99+
addProbeToProbeList(new TokenbindingProbe(config, parallelExecutor));
100+
addProbeToProbeList(new HttpHeaderProbe(config, parallelExecutor));
101+
addProbeToProbeList(new HttpFalseStartProbe(config, parallelExecutor));
102+
addProbeToProbeList(new ECPointFormatProbe(config, parallelExecutor));
103+
addProbeToProbeList(new ResumptionProbe(config, parallelExecutor));
104+
addProbeToProbeList(new RenegotiationProbe(config, parallelExecutor));
105+
addProbeToProbeList(new SessionTicketZeroKeyProbe(config, parallelExecutor));
106+
addProbeToProbeList(new HeartbleedProbe(config, parallelExecutor));
107+
addProbeToProbeList(new PaddingOracleProbe(config, parallelExecutor));
108+
addProbeToProbeList(new BleichenbacherProbe(config, parallelExecutor));
109+
addProbeToProbeList(new TlsPoodleProbe(config, parallelExecutor));
110+
addProbeToProbeList(new InvalidCurveProbe(config, parallelExecutor));
111+
addProbeToProbeList(new DrownProbe(config, parallelExecutor));
112+
addProbeToProbeList(new EarlyCcsProbe(config, parallelExecutor));
113+
// addProbeToProbeList(new MacProbe(config, parallelExecutor));
114+
addProbeToProbeList(new CcaSupportProbe(config, parallelExecutor));
115+
addProbeToProbeList(new CcaRequiredProbe(config, parallelExecutor));
116+
addProbeToProbeList(new CcaProbe(config, parallelExecutor));
117+
addProbeToProbeList(new EsniProbe(config, parallelExecutor));
118+
addProbeToProbeList(new CertificateTransparencyProbe(config, parallelExecutor));
119+
addProbeToProbeList(new RecordFragmentationProbe(config, parallelExecutor));
120+
addProbeToProbeList(new HelloRetryProbe(config, parallelExecutor));
121121
afterList.add(new Sweet32AfterProbe());
122122
afterList.add(new PoodleAfterProbe());
123123
afterList.add(new FreakAfterProbe());

0 commit comments

Comments
 (0)