Fixed dependencies for Java 11 (#69)

* Updated dependency for Java 11

* Fixed profiles for wolfSSL and matrixssl

* Removed certificate fields as they do not work as expected

Author: mmaehren

images/openssl/openssl-1_1_1X.sh

@@ -2,7 +2,7 @@
 cd "$(dirname "$0")" || exit 1
 source ../helper-functions.sh
 
-array=(a b c d e f g h i -pre1 -pre2 -pre3 -pre4 -pre5 -pre6 -pre7 -pre8 -pre9)
+array=(a b c d e f g h i m -pre1 -pre2 -pre3 -pre4 -pre5 -pre6 -pre7 -pre8 -pre9)
 typeset -i i=0 max=${#array[*]}
 _docker build --build-arg VERSION= -t ${DOCKER_REPOSITORY}openssl-server:1.1.1 -f Dockerfile-1_1_1x --target openssl-server .
 _docker build --build-arg VERSION= -t ${DOCKER_REPOSITORY}openssl-client:1.1.1 -f Dockerfile-1_1_1x --target openssl-client .

images/rustls/rustls.sh

@@ -16,7 +16,7 @@ for i in "${versions[@]}"; do
     _docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}rustls-server:${i} --target rustls-server -f Dockerfile_15_2-16_0 .
 done
 
-versions=(0.19.0 0.18.1 0.18.0 0.17.0)
+versions=(0.20.2 0.19.0 0.18.1 0.18.0 0.17.0)
 for i in "${versions[@]}"; do
     _docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}rustls-client:${i} --target rustls-client -f Dockerfile .
     _docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}rustls-server:${i} --target rustls-server -f Dockerfile .

pom.xml

@@ -72,7 +72,18 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
+            <version>0.10.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.3</version>
+            <type>jar</type>
         </dependency>
     </dependencies>
     <build>
@@ -200,7 +211,7 @@
     </build>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 </project>

src/main/java/de/rub/nds/tls/subject/params/ParameterProfileManager.java

@@ -5,7 +5,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
 
 import javax.xml.bind.JAXBException;
 import javax.xml.stream.XMLStreamException;
@@ -18,6 +17,7 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import org.reflections.scanners.Scanners;
 
 public class ParameterProfileManager {
 
@@ -75,7 +75,7 @@ protected ParameterProfileManager() {
     }
 
     private List<String> getResourceFiles(String path) throws IOException {
-        Reflections reflections = new Reflections(null, new ResourcesScanner());
+        Reflections reflections = new Reflections("profiles", Scanners.Resources);
         Set<String> resourceList = reflections.getResources(Pattern.compile(".*\\.profile")).parallelStream().map(x -> new File(x).getName()).collect(Collectors.toSet());
         return new ArrayList<>(resourceList);
     }

src/main/resources/profiles/server/matrixssl.profile

@@ -8,8 +8,4 @@
         <cmdParameter>-P [port]</cmdParameter>
         <type>HOST_PORT</type>
     </Parameter>
-    <Parameter>
-        <cmdParameter>-c [cert] -k [key]</cmdParameter>
-        <type>CERTIFICATE_KEY</type>
-    </Parameter>
 </parameterProfile>

src/main/resources/profiles/server/wolfssl.profile

@@ -5,7 +5,7 @@
     <type>WOLFSSL</type>
     <role>SERVER</role>
     <Parameter>
-        <cmdParameter>-c [cert] -k [key] -v 4</cmdParameter>
+        <cmdParameter>-c [cert] -k [key]</cmdParameter>
         <type>CERTIFICATE_KEY</type>
     </Parameter>
     <Parameter>