Skip to content

Commit b5a28a0

Browse files
JonSnowWhiteJonSnowWhite
committed
Merge branch 'master' into dependabot/maven/junit-junit-4.13.1
2 parents 4417ff3 + edab4c5 commit b5a28a0

File tree

549 files changed

+125887
-123835
lines changed

Some content is hidden

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

549 files changed

+125887
-123835
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ FROM openjdk:8-alpine
1111
COPY --from=build-image /build/TLS-Scanner/apps /apps
1212

1313
WORKDIR /apps
14-
ENTRYPOINT ["java", "-jar", "TLS-Scanner.jar"]
14+
ENTRYPOINT ["java", "-jar", "TLS-Server-Scanner.jar"]
1515

‎README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# TLS-Scanner
2+
3+
[![release](https://img.shields.io/badge/Release-v4.0.0-blue.svg)](https://github.com/RUB-NDS/TLS-Scanner/releases)
4+
![licence](https://img.shields.io/badge/License-Apachev2-brightgreen.svg)
5+
[![Build Status](https://hydrogen.cloud.nds.rub.de/buildStatus/icon.svg?job=TLS-Scanner)](https://hydrogen.cloud.nds.rub.de/job/TLS-Scanner/)
6+
27
TLS-Scanner is a tool created by the Chair for Network and Data Security from the Ruhr-University Bochum to assist pentesters and security researchers in the evaluation of TLS Server configurations.
38

49
**Please note:** *TLS-Scanner is a research tool intended for TLS developers, pentesters, administrators and researchers. There is no GUI. It is in the first version and may contain some bugs.*
@@ -11,7 +16,7 @@ $ cd TLS-Scanner
1116
$ mvn clean package
1217

1318
```
14-
Alternatively, if you are in hurry, you can skip the tests by using:
19+
Alternatively, if you are in a hurry, you can skip the tests by using:
1520
```bash
1621
$ mvn clean package -DskipTests=true
1722
```
@@ -39,4 +44,5 @@ $ docker build . -t tlsscanner
3944
$ docker run -t tlsscanner
4045
```
4146

42-
**Please note:** *I am by no means familiar with Docker best practices. If you know how to improve the Dockerfile feel free to issue a pullrequest*
47+
**Please note:** *I am by no means familiar with Docker best practices. If you know how to improve the Dockerfile
48+
feel free to issue a pull request*

‎TLS-Client-Scanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>de.rub.nds.tlsscanner</groupId>
66
<artifactId>TLS-Scanner</artifactId>
7-
<version>4.0.0</version>
7+
<version>4.1.0-SNAPSHOT</version>
88
</parent>
99
<name>TLS-Client-Scanner</name>
1010
<packaging>jar</packaging>

‎TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/Main.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
/**
2-
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker.
2+
* TLS-Client-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2019 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2017-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9-
package de.rub.nds.tlsscanner.clientscanner;
10-
11-
import com.beust.jcommander.JCommander;
12-
import com.beust.jcommander.ParameterException;
13-
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
14-
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
159

16-
import de.rub.nds.tlsscanner.serverscanner.config.ScannerConfig;
10+
package de.rub.nds.tlsscanner.clientscanner;
1711

1812
public class Main {
1913

‎TLS-Scanner-Core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>de.rub.nds.tlsscanner</groupId>
66
<artifactId>TLS-Scanner</artifactId>
7-
<version>4.0.0</version>
7+
<version>4.1.0-SNAPSHOT</version>
88
</parent>
99
<packaging>jar</packaging>
1010
<artifactId>TLS-Scanner-Core</artifactId>

‎TLS-Server-Scanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>de.rub.nds.tlsscanner</groupId>
66
<artifactId>TLS-Scanner</artifactId>
7-
<version>4.0.0</version>
7+
<version>4.1.0-SNAPSHOT</version>
88
</parent>
99
<name>TLS-Server-Scanner</name>
1010
<packaging>jar</packaging>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/**
2-
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker.
2+
* TLS-Server-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2019 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2017-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9+
910
package de.rub.nds.tlsscanner.serverscanner;
1011

1112
import org.apache.logging.log4j.LogManager;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/**
2-
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker.
2+
* TLS-Server-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2019 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2017-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9+
910
package de.rub.nds.tlsscanner.serverscanner;
1011

1112
import com.beust.jcommander.JCommander;
1213
import com.beust.jcommander.ParameterException;
13-
1414
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
1515
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
1616
import de.rub.nds.tlsscanner.serverscanner.config.ScannerConfig;
@@ -40,14 +40,14 @@ public static void main(String[] args) throws IOException {
4040
LOGGER.info("Performing Scan, this may take some time...");
4141
SiteReport report = scanner.scan();
4242
LOGGER.info("Scanned in: " + ((System.currentTimeMillis() - time) / 1000) + "s\n");
43-
ConsoleLogger.CONSOLE.info(AnsiColor.RESET.getCode() + "Scanned in: "
44-
+ ((System.currentTimeMillis() - time) / 1000) + "s\n"
45-
+ report.getFullReport(config.getReportDetail(), !config.isNoColor()));
46-
} catch (ConfigurationException E) {
47-
LOGGER.error("Encountered a ConfigurationException aborting.", E);
43+
ConsoleLogger.CONSOLE
44+
.info(AnsiColor.RESET.getCode() + "Scanned in: " + ((System.currentTimeMillis() - time) / 1000)
45+
+ "s\n" + report.getFullReport(config.getReportDetail(), !config.isNoColor()));
46+
} catch (ConfigurationException e) {
47+
LOGGER.error("Encountered a ConfigurationException aborting.", e);
4848
}
49-
} catch (ParameterException E) {
50-
LOGGER.error("Could not parse provided parameters", E);
49+
} catch (ParameterException e) {
50+
LOGGER.error("Could not parse provided parameters", e);
5151
commander.usage();
5252
}
5353
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/**
2-
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker.
2+
* TLS-Server-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2019 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2017-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9+
910
package de.rub.nds.tlsscanner.serverscanner;
1011

1112
import de.rub.nds.tlsscanner.serverscanner.probe.TlsProbe;
@@ -14,7 +15,7 @@
1415

1516
/**
1617
*
17-
* @author Robert Merget - [email protected]
18+
* @author Robert Merget - {@literal <[email protected]>}
1819
*/
1920
public class ScanJob {
2021

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/**
2-
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker.
2+
* TLS-Server-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
33
*
4-
* Copyright 2017-2019 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2017-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
9+
910
package de.rub.nds.tlsscanner.serverscanner;
1011

1112
import de.rub.nds.tlsscanner.serverscanner.report.SiteReport;

0 commit comments

Comments
 (0)