Merge pull request #108 from tls-attacker/master

Fixes for setup script and OpenSSL 3_x build

Author: mmaehren

certs/setup.sh

@@ -10,8 +10,8 @@ docker run --rm -v cert-data:/cert/ certs cp -r ./. /cert/
 
 echo "Copying Root CA Certificate to relevant image folders"
 docker run --rm -d -v cert-data:/cert/ --name tmp-certs certs sleep 10
-docker cp tmp-certs:/cert/ca.pem ../images/baseimage/
-docker cp tmp-certs:/cert/ca.pem ../images/firefox/
+docker cp tmp-certs:/cert/ca.pem ../src/main/resources/images/baseimage/
+docker cp tmp-certs:/cert/ca.pem ../src/main/resources/images/firefox/
 
 if [ -d ./out ]
 then

src/main/resources/images/openssl/build.json

@@ -351,7 +351,7 @@
 
           "openssl-3.x": {
             "name": "openssl",
-            "dockerfile": "Dockerfile-3x",
+            "dockerfile": "Dockerfile-3_x",
             "versions": [
                 "0.0",
                 "0.1",