Skip to content

Commit 9a7866e

Browse files
TrueSkrillorNErinola
TrueSkrillor
and
NErinola
authored
style: remove ratchet and update license header to 2023 (#305)
Co-authored-by: Nurullah Erinola <[email protected]>
1 parent 1c4f32d commit 9a7866e

File tree

490 files changed

+4553
-3225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

490 files changed

+4553
-3225
lines changed

‎Jenkinsfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ pipeline {
1414
stages {
1515
stage('Clean') {
1616
steps {
17-
// This is necessary to make the origin/master refspec available to spotless (for ratcheting)
18-
withCredentials([gitUsernamePassword(credentialsId: 'github-app-tls-attacker')]) {
19-
sh 'git fetch origin master:refs/remotes/origin/master'
20-
}
2117
withMaven(jdk: env.JDK_TOOL_NAME, maven: env.MAVEN_TOOL_NAME) {
2218
sh 'mvn clean'
2319
}

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/afterprobe/AfterProbe.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
/**
2-
* Scanner-Core - A TLS configuration and analysis tool based on TLS-Attacker
1+
/*
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
109
package de.rub.nds.scanner.core.afterprobe;
1110

1211
import de.rub.nds.scanner.core.report.ScanReport;

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/config/ScannerConfig.java

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
/**
2-
* Scanner-Core - A TLS configuration and analysis tool based on TLS-Attacker
1+
/*
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
109
package de.rub.nds.scanner.core.config;
1110

1211
import com.beust.jcommander.Parameter;
@@ -19,21 +18,34 @@
1918

2019
public abstract class ScannerConfig extends TLSDelegateConfig {
2120

22-
@Parameter(names = "-noColor", required = false, description = "If you use Windows or don't want colored text.")
21+
@Parameter(
22+
names = "-noColor",
23+
required = false,
24+
description = "If you use Windows or don't want colored text.")
2325
private boolean noColor = false;
2426

25-
@Parameter(names = "-scanDetail", required = false, description = "How detailed do you want to scan?")
27+
@Parameter(
28+
names = "-scanDetail",
29+
required = false,
30+
description = "How detailed do you want to scan?")
2631
private ScannerDetail scanDetail = ScannerDetail.NORMAL;
2732

28-
@Parameter(names = "-reportDetail", required = false, description = "How detailed do you want the report to be?")
33+
@Parameter(
34+
names = "-reportDetail",
35+
required = false,
36+
description = "How detailed do you want the report to be?")
2937
private ScannerDetail reportDetail = ScannerDetail.NORMAL;
3038

31-
@Parameter(names = "-outputFile", required = false,
32-
description = "Specify a file to write the site report in JSON to")
39+
@Parameter(
40+
names = "-outputFile",
41+
required = false,
42+
description = "Specify a file to write the site report in JSON to")
3343
private String outputFile = null;
3444

35-
@Parameter(names = "-probeTimeout", required = false,
36-
description = "The timeout for each probe in ms (default 1800000)")
45+
@Parameter(
46+
names = "-probeTimeout",
47+
required = false,
48+
description = "The timeout for each probe in ms (default 1800000)")
3749
private int probeTimeout = 1800000;
3850

3951
protected List<ProbeType> probes = null;

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/constants/AnalyzedProperty.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
/**
2-
* Scanner-Core - A TLS configuration and analysis tool based on TLS-Attacker
1+
/*
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
109
package de.rub.nds.scanner.core.constants;
1110

1211
import jakarta.xml.bind.annotation.XmlAccessType;

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/constants/AnalyzedPropertyCategory.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
/**
2-
* Scanner-Core - A TLS configuration and analysis tool based on TLS-Attacker
1+
/*
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
109
package de.rub.nds.scanner.core.constants;
1110

1211
import jakarta.xml.bind.annotation.XmlAccessType;
1312
import jakarta.xml.bind.annotation.XmlAccessorType;
1413

1514
@XmlAccessorType(XmlAccessType.FIELD)
16-
public interface AnalyzedPropertyCategory {
17-
18-
}
15+
public interface AnalyzedPropertyCategory {}

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/constants/ProbeType.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
/**
2-
* Scanner-Core - A TLS configuration and analysis tool based on TLS-Attacker
1+
/*
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
109
package de.rub.nds.scanner.core.constants;
1110

1211
import jakarta.xml.bind.annotation.XmlAccessType;

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/constants/RandomnessConstants.java

Lines changed: 162 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,177 @@
1-
/**
2-
* Scanner-Core - A TLS configuration and analysis tool based on TLS-Attacker
1+
/*
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
109
package de.rub.nds.scanner.core.constants;
1110

1211
public class RandomnessConstants {
1312

1413
// See NIST SP 800-22 2.4.4 (3)
15-
public final static int[][] LONGEST_RUN_VALUES = { { 8, 3, 16 }, { 128, 5, 49 }, { 10000, 6, 75 } };
14+
public static final int[][] LONGEST_RUN_VALUES = {{8, 3, 16}, {128, 5, 49}, {10000, 6, 75}};
1615
// See NIST SP 800-22 2.4.4 (2)
17-
public final static int[][] LONGEST_RUN_EXPECTATION =
18-
{ { 1, 2, 3, 4 }, { 4, 5, 6, 7, 8, 9 }, { 10, 11, 12, 13, 14, 15, 16 } };
16+
public static final int[][] LONGEST_RUN_EXPECTATION = {
17+
{1, 2, 3, 4}, {4, 5, 6, 7, 8, 9}, {10, 11, 12, 13, 14, 15, 16}
18+
};
1919
// See NIST SP 800-22 3.4
20-
public final static double[][] LONGEST_RUN_PROBABILITIES =
21-
{ { 0.2148, 0.3672, 0.2305, 0.1875 }, { 0.1174, 0.2430, 0.2493, 0.1752, 0.1027, 0.1124 },
22-
{ 0.0882, 0.2092, 0.2483, 0.1933, 0.1208, 0.0675, 0.0727 } };
20+
public static final double[][] LONGEST_RUN_PROBABILITIES = {
21+
{0.2148, 0.3672, 0.2305, 0.1875},
22+
{0.1174, 0.2430, 0.2493, 0.1752, 0.1027, 0.1124},
23+
{0.0882, 0.2092, 0.2483, 0.1933, 0.1208, 0.0675, 0.0727}
24+
};
2325
// Directly taken from the NIST statistical test suite code
2426
// For version 2.1.2 this template was found under templates/template9
25-
public final static String[][] TEMPLATE_NINE = { { "000000001" }, { "000000011" }, { "000000101" }, { "000000111" },
26-
{ "000001001" }, { "000001011" }, { "000001101" }, { "000001111" }, { "000010001" }, { "000010011" },
27-
{ "000010101" }, { "000010111" }, { "000011001" }, { "000011011" }, { "000011101" }, { "000011111" },
28-
{ "000100011" }, { "000100101" }, { "000100111" }, { "000101001" }, { "000101011" }, { "000101101" },
29-
{ "000101111" }, { "000110011" }, { "000110101" }, { "000110111" }, { "000111001" }, { "000111011" },
30-
{ "000111101" }, { "000111111" }, { "001000011" }, { "001000101" }, { "001000111" }, { "001001011" },
31-
{ "001001101" }, { "001001111" }, { "001010011" }, { "001010101" }, { "001010111" }, { "001011011" },
32-
{ "001011101" }, { "001011111" }, { "001100101" }, { "001100111" }, { "001101011" }, { "001101101" },
33-
{ "001101111" }, { "001110101" }, { "001110111" }, { "001111011" }, { "001111101" }, { "001111111" },
34-
{ "010000011" }, { "010000111" }, { "010001011" }, { "010001111" }, { "010010011" }, { "010010111" },
35-
{ "010011011" }, { "010011111" }, { "010100011" }, { "010100111" }, { "010101011" }, { "010101111" },
36-
{ "010110011" }, { "010110111" }, { "010111011" }, { "010111111" }, { "011000111" }, { "011001111" },
37-
{ "011010111" }, { "011011111" }, { "011101111" }, { "011111111" }, { "100000000" }, { "100010000" },
38-
{ "100100000" }, { "100101000" }, { "100110000" }, { "100111000" }, { "101000000" }, { "101000100" },
39-
{ "101001000" }, { "101001100" }, { "101010000" }, { "101010100" }, { "101011000" }, { "101011100" },
40-
{ "101100000" }, { "101100100" }, { "101101000" }, { "101101100" }, { "101110000" }, { "101110100" },
41-
{ "101111000" }, { "101111100" }, { "110000000" }, { "110000010" }, { "110000100" }, { "110001000" },
42-
{ "110001010" }, { "110010000" }, { "110010010" }, { "110010100" }, { "110011000" }, { "110011010" },
43-
{ "110100000" }, { "110100010" }, { "110100100" }, { "110101000" }, { "110101010" }, { "110101100" },
44-
{ "110110000" }, { "110110010" }, { "110110100" }, { "110111000" }, { "110111010" }, { "110111100" },
45-
{ "111000000" }, { "111000010" }, { "111000100" }, { "111000110" }, { "111001000" }, { "111001010" },
46-
{ "111001100" }, { "111010000" }, { "111010010" }, { "111010100" }, { "111010110" }, { "111011000" },
47-
{ "111011010" }, { "111011100" }, { "111100000" }, { "111100010" }, { "111100100" }, { "111100110" },
48-
{ "111101000" }, { "111101010" }, { "111101100" }, { "111101110" }, { "111110000" }, { "111110010" },
49-
{ "111110100" }, { "111110110" }, { "111111000" }, { "111111010" }, { "111111100" }, { "111111110" } };
50-
27+
public static final String[][] TEMPLATE_NINE = {
28+
{"000000001"},
29+
{"000000011"},
30+
{"000000101"},
31+
{"000000111"},
32+
{"000001001"},
33+
{"000001011"},
34+
{"000001101"},
35+
{"000001111"},
36+
{"000010001"},
37+
{"000010011"},
38+
{"000010101"},
39+
{"000010111"},
40+
{"000011001"},
41+
{"000011011"},
42+
{"000011101"},
43+
{"000011111"},
44+
{"000100011"},
45+
{"000100101"},
46+
{"000100111"},
47+
{"000101001"},
48+
{"000101011"},
49+
{"000101101"},
50+
{"000101111"},
51+
{"000110011"},
52+
{"000110101"},
53+
{"000110111"},
54+
{"000111001"},
55+
{"000111011"},
56+
{"000111101"},
57+
{"000111111"},
58+
{"001000011"},
59+
{"001000101"},
60+
{"001000111"},
61+
{"001001011"},
62+
{"001001101"},
63+
{"001001111"},
64+
{"001010011"},
65+
{"001010101"},
66+
{"001010111"},
67+
{"001011011"},
68+
{"001011101"},
69+
{"001011111"},
70+
{"001100101"},
71+
{"001100111"},
72+
{"001101011"},
73+
{"001101101"},
74+
{"001101111"},
75+
{"001110101"},
76+
{"001110111"},
77+
{"001111011"},
78+
{"001111101"},
79+
{"001111111"},
80+
{"010000011"},
81+
{"010000111"},
82+
{"010001011"},
83+
{"010001111"},
84+
{"010010011"},
85+
{"010010111"},
86+
{"010011011"},
87+
{"010011111"},
88+
{"010100011"},
89+
{"010100111"},
90+
{"010101011"},
91+
{"010101111"},
92+
{"010110011"},
93+
{"010110111"},
94+
{"010111011"},
95+
{"010111111"},
96+
{"011000111"},
97+
{"011001111"},
98+
{"011010111"},
99+
{"011011111"},
100+
{"011101111"},
101+
{"011111111"},
102+
{"100000000"},
103+
{"100010000"},
104+
{"100100000"},
105+
{"100101000"},
106+
{"100110000"},
107+
{"100111000"},
108+
{"101000000"},
109+
{"101000100"},
110+
{"101001000"},
111+
{"101001100"},
112+
{"101010000"},
113+
{"101010100"},
114+
{"101011000"},
115+
{"101011100"},
116+
{"101100000"},
117+
{"101100100"},
118+
{"101101000"},
119+
{"101101100"},
120+
{"101110000"},
121+
{"101110100"},
122+
{"101111000"},
123+
{"101111100"},
124+
{"110000000"},
125+
{"110000010"},
126+
{"110000100"},
127+
{"110001000"},
128+
{"110001010"},
129+
{"110010000"},
130+
{"110010010"},
131+
{"110010100"},
132+
{"110011000"},
133+
{"110011010"},
134+
{"110100000"},
135+
{"110100010"},
136+
{"110100100"},
137+
{"110101000"},
138+
{"110101010"},
139+
{"110101100"},
140+
{"110110000"},
141+
{"110110010"},
142+
{"110110100"},
143+
{"110111000"},
144+
{"110111010"},
145+
{"110111100"},
146+
{"111000000"},
147+
{"111000010"},
148+
{"111000100"},
149+
{"111000110"},
150+
{"111001000"},
151+
{"111001010"},
152+
{"111001100"},
153+
{"111010000"},
154+
{"111010010"},
155+
{"111010100"},
156+
{"111010110"},
157+
{"111011000"},
158+
{"111011010"},
159+
{"111011100"},
160+
{"111100000"},
161+
{"111100010"},
162+
{"111100100"},
163+
{"111100110"},
164+
{"111101000"},
165+
{"111101010"},
166+
{"111101100"},
167+
{"111101110"},
168+
{"111110000"},
169+
{"111110010"},
170+
{"111110100"},
171+
{"111110110"},
172+
{"111111000"},
173+
{"111111010"},
174+
{"111111100"},
175+
{"111111110"}
176+
};
51177
}

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/constants/ScannerDetail.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
/**
2-
* Scanner-Core - A TLS configuration and analysis tool based on TLS-Attacker
1+
/*
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
109
package de.rub.nds.scanner.core.constants;
1110

1211
public enum ScannerDetail implements Comparable<ScannerDetail> {

‎Scanner-Core/src/main/java/de/rub/nds/scanner/core/constants/TestResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2022 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
4+
* Copyright 2017-2023 Ruhr University Bochum, Paderborn University, and Hackmanit GmbH
55
*
66
* Licensed under Apache License, Version 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0.txt

0 commit comments

Comments
 (0)