Skip to content

Commit d69debe

Browse files
ic0nsic0ns
authored
Merge pull request #97 from RUB-NDS/3.6.0update
3.6.0update
2 parents 5a687c0 + d121cd9 commit d69debe

File tree

6 files changed

+37
-18
lines changed

6 files changed

+37
-18
lines changed

‎TLS-Client-Scanner/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@
3030
<plugin>
3131
<groupId>org.apache.maven.plugins</groupId>
3232
<artifactId>maven-dependency-plugin</artifactId>
33+
<version>3.1.2</version>
3334
</plugin>
3435
<plugin>
3536
<groupId>org.apache.maven.plugins</groupId>
3637
<artifactId>maven-failsafe-plugin</artifactId>
38+
<version>3.0.0-M5</version>
3739
</plugin>
3840
<plugin>
3941
<groupId>org.apache.maven.plugins</groupId>
4042
<artifactId>maven-surefire-plugin</artifactId>
43+
<version>3.0.0-M5</version>
4144
</plugin>
4245
</plugins>
4346
</build>

‎TLS-Scanner-Core/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
<plugin>
1414
<groupId>org.apache.maven.plugins</groupId>
1515
<artifactId>maven-failsafe-plugin</artifactId>
16+
<version>3.0.0-M5</version>
1617
</plugin>
1718
<plugin>
1819
<groupId>org.apache.maven.plugins</groupId>
1920
<artifactId>maven-surefire-plugin</artifactId>
21+
<version>3.0.0-M5</version>
2022
</plugin>
2123
<plugin>
2224
<artifactId>maven-resources-plugin</artifactId>

‎TLS-Server-Scanner/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,17 @@
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-dependency-plugin</artifactId>
44+
<version>3.1.2</version>
4445
</plugin>
4546
<plugin>
4647
<groupId>org.apache.maven.plugins</groupId>
4748
<artifactId>maven-failsafe-plugin</artifactId>
49+
<version>3.0.0-M5</version>
4850
</plugin>
4951
<plugin>
5052
<groupId>org.apache.maven.plugins</groupId>
5153
<artifactId>maven-surefire-plugin</artifactId>
54+
<version>3.0.0-M5</version>
5255
</plugin>
5356
</plugins>
5457
</build>

‎TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/config/ScannerConfig.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ public class ScannerConfig extends TLSDelegateConfig {
3434
@Parameter(names = "-noColor", required = false, description = "If you use Windows or don't want colored text.")
3535
private boolean noColor = false;
3636

37-
@ParametersDelegate
38-
private GeneralDelegate generalDelegate;
39-
4037
@Parameter(names = "-scanDetail", required = false, description = "How detailed do you want to scan?")
4138
private ScannerDetail scanDetail = ScannerDetail.NORMAL;
4239

@@ -57,24 +54,20 @@ public class ScannerConfig extends TLSDelegateConfig {
5754

5855
public ScannerConfig(GeneralDelegate delegate) {
5956
super(delegate);
60-
this.generalDelegate = delegate;
61-
clientDelegate = new ClientDelegate();
62-
starttlsDelegate = new StarttlsDelegate();
63-
ccaDelegate = new CcaDelegate();
57+
this.clientDelegate = new ClientDelegate();
58+
this.starttlsDelegate = new StarttlsDelegate();
59+
this.ccaDelegate = new CcaDelegate();
6460
addDelegate(clientDelegate);
65-
addDelegate(generalDelegate);
6661
addDelegate(starttlsDelegate);
6762
addDelegate(ccaDelegate);
6863
}
6964

7065
public ScannerConfig(GeneralDelegate delegate, ClientDelegate clientDelegate) {
7166
super(delegate);
72-
this.generalDelegate = delegate;
7367
this.clientDelegate = clientDelegate;
74-
starttlsDelegate = new StarttlsDelegate();
75-
ccaDelegate = new CcaDelegate();
68+
this.starttlsDelegate = new StarttlsDelegate();
69+
this.ccaDelegate = new CcaDelegate();
7670
addDelegate(clientDelegate);
77-
addDelegate(generalDelegate);
7871
addDelegate(starttlsDelegate);
7972
addDelegate(ccaDelegate);
8073
}

‎TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/rating/RatingIO.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public static void writeRecommendations(Recommendations r, OutputStream os) {
3939
JAXB.marshal(r, tempStream);
4040
try {
4141
os.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes());
42-
} catch (IOException | TransformerException | XPathExpressionException | XPathFactoryConfigurationException
43-
| ParserConfigurationException | SAXException ex) {
42+
} catch (IOException | TransformerException | XPathExpressionException | ParserConfigurationException
43+
| SAXException ex) {
4444
throw new RuntimeException("Could not format XML");
4545
}
4646
}
@@ -67,8 +67,8 @@ public static void writeRatingInfluencers(RatingInfluencers ri, OutputStream os)
6767
JAXB.marshal(ri, tempStream);
6868
try {
6969
os.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes());
70-
} catch (IOException | TransformerException | XPathExpressionException | XPathFactoryConfigurationException
71-
| ParserConfigurationException | SAXException ex) {
70+
} catch (IOException | TransformerException | XPathExpressionException | ParserConfigurationException
71+
| SAXException ex) {
7272
throw new RuntimeException("Could not format XML");
7373
}
7474
}

‎pom.xml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111
<module>TLS-Client-Scanner</module>
1212
</modules>
1313
<dependencies>
14+
<dependency>
15+
<groupId>org.slf4j</groupId>
16+
<artifactId>slf4j-log4j12</artifactId>
17+
<version>1.7.30</version>
18+
</dependency>
19+
<dependency>
20+
<groupId>org.slf4j</groupId>
21+
<artifactId>slf4j-api</artifactId>
22+
<version>1.7.30</version>
23+
</dependency>
1424
<dependency>
1525
<groupId>de.rub.nds.tlsattacker</groupId>
1626
<artifactId>TLS-Core</artifactId>
@@ -155,7 +165,7 @@
155165
<plugin>
156166
<groupId>org.apache.maven.plugins</groupId>
157167
<artifactId>maven-failsafe-plugin</artifactId>
158-
<version>2.20.1</version>
168+
<version>3.0.0-M5</version>
159169
<configuration>
160170
<!-- By default, the Failsafe plugin excludes various files. We have to override that. -->
161171
<includes>
@@ -176,15 +186,23 @@
176186
<plugin>
177187
<groupId>org.apache.maven.plugins</groupId>
178188
<artifactId>maven-surefire-plugin</artifactId>
179-
<version>2.19.1</version>
189+
<version>3.0.0-M5</version>
180190
<configuration>
181191
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
182192
</configuration>
193+
<dependencies>
194+
<dependency>
195+
<groupId>org.apache.maven.surefire</groupId>
196+
<artifactId>surefire-junit47</artifactId>
197+
<version>3.0.0-M5</version>
198+
</dependency>
199+
</dependencies>
183200
</plugin>
184201
<!-- Format the Code -->
185202
<plugin>
186203
<groupId>net.revelc.code</groupId>
187204
<artifactId>formatter-maven-plugin</artifactId>
205+
<version>0.5.2</version>
188206
<configuration>
189207
<configFile>${main.basedir}/maven-eclipse-codestyle.xml</configFile>
190208
<lineEnding>LF</lineEnding>

0 commit comments

Comments
 (0)