Merge branch 'master' of https://github.com/tls-attacker/TLS-Scanner

Author: NErinola

Dockerfile

@@ -1,12 +1,26 @@
 FROM maven:3.6.1-jdk-11 AS build-image
 WORKDIR /build
+RUN git clone https://github.com/RUB-NDS/ModifiableVariable.git 
+RUN git clone https://github.com/RUB-NDS/ASN.1-Tool.git
+RUN git clone https://github.com/RUB-NDS/X509-Attacker.git
+RUN git clone https://github.com/RUB-NDS/TLS-Attacker.git
 RUN git clone https://github.com/RUB-NDS/TLS-Scanner.git --recurse-submodules
+WORKDIR /build/ModifiableVariable
+RUN git checkout tags/3.5.0
+RUN mvn clean install -DskipTests=true
+WORKDIR /build/ASN.1-Tool
+RUN mvn clean install -DskipTests=true
+WORKDIR /build/X509-Attacker
+RUN mvn clean install -DskipTests=true
+
+WORKDIR /build/TLS-Attacker
+RUN mvn clean install -DskipTests=true
 
 WORKDIR /build/TLS-Scanner
 RUN mvn clean install -DskipTests=true
 
 #############
-FROM openjdk:8-alpine
+FROM openjdk:11
 
 COPY --from=build-image /build/TLS-Scanner/apps /apps
 

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/constants/TlsProbeType.java

@@ -46,9 +46,9 @@ public enum TlsProbeType implements ProbeType {
     SNI("Server name indication (SNI)"),
     HANDSHAKE_SIMULATION("Handshake simulation"),
     MAC("MAC"),
-    CCA_SUPPORT("Client certificate authenication support"),
-    CCA_REQUIRED("Client certificate authenication required"),
-    CCA("Client certificate authenication bypasses"),
+    CCA_SUPPORT("Client certificate authentication support"),
+    CCA_REQUIRED("Client certificate authentication required"),
+    CCA("Client certificate authentication bypasses"),
     DIRECT_RACCOON("Direct RACCOON"),
     EC_POINT_FORMAT("EC point formats"),
     RACCOON_ATTACK("RACCOON attack"),