Merge pull request #96 from tls-attacker/cherrypickPR57

Cherrypick from #57

Author: mmaehren

images/baseimage/build-base-image.sh

@@ -3,17 +3,17 @@ cd "$(dirname "$0")" || exit 1
 source ../helper-functions.sh
 
 # https://wiki.alpinelinux.org/wiki/Alpine_Linux:Releases
-_docker build --build-arg VERSION=3.12 -t alpine-build:3.12 .
+_docker build --build-arg VERSION=3.12 --no-cache -t alpine-build:3.12 .
 #_docker build --build-arg VERSION=3.11 -t alpine-build:3.11 .
 #_docker build --build-arg VERSION=3.10 -t alpine-build:3.10 .
 #_docker build --build-arg VERSION=3.9 -t alpine-build:3.9 .
 #_docker build --build-arg VERSION=3.8 -t alpine-build:3.8 .
 #_docker build --build-arg VERSION=3.7 -t alpine-build:3.7 .
-_docker build --build-arg VERSION=3.6 -t alpine-build:3.6 .
+_docker build --build-arg VERSION=3.6 --no-cache -t alpine-build:3.6 .
 #_docker build --build-arg VERSION=3.5 -t alpine-build:3.5 .
 #_docker build --build-arg VERSION=3.4 -t alpine-build:3.4 .
 
-_docker build --build-arg VERSION=sid -t debian-build:sid -f Dockerfile_debian .
+_docker build --build-arg VERSION=sid --no-cache -t debian-build:sid -f Dockerfile_debian .
 
 _docker build -t entrypoint -f Dockerfile_entrypoint .
 

images/boringssl/readme

@@ -8,7 +8,7 @@ BORINGSSL
 - clients successfully tested: all versions
 
 build server:	docker build -t boringssl-server --target bearssl-server .
-run tls server:	docker run -it --rm boringssl-server
+run tls server:	docker run -it --rm -v cert-data:/cert/:ro,nocopy boringssl-server -accept 4433 -cert /cert/rsa2048cert.pem -key /cert/rsa2048key.pem -loop 
 run tls shim:   docker run -it --rm --entrypoint /bin/bssl_shim boringssl-server
 
 build client:	docker build -t boringssl-client --target bearssl-client .

images/bouncycastle/bouncycastletls.sh

@@ -2,7 +2,7 @@
 cd "$(dirname "$0")" || exit 1
 source ../helper-functions.sh
 
-array=(50 51 52 53 54 55 56 57 58)
+array=(50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66)
 typeset -i i=0 max=${#array[*]}
 while (( i < max ))
 do

images/gnutls/readme

@@ -12,7 +12,7 @@ GNUTLS
 - server and client versions failed to build (have to check build process): 3.5.7, 3.4.17, 3.3.15, 3.3.28
 
 build server:	docker build -t gnutls-server --target gnutls-server .
-run tls server:	docker run -it --rm gnutls-server
+run tls server:	docker run -it --rm -v cert-data:/cert/:ro,nocopy gnutls-server --port=4433 --x509certfile=/cert/rsa2048cert.pem --x509keyfile=/cert/rsa2048key.pem --disable-client-cert
 
 build client:	docker build -t gnutls-client --target gnutls-client .
 run tls client:	docker run -it --rm gnutls-client

images/openssl/openssl-1_1_1X.sh

@@ -8,7 +8,7 @@ _docker build --build-arg VERSION= -t ${DOCKER_REPOSITORY}openssl-server:1.1.1 -
 _docker build --build-arg VERSION= -t ${DOCKER_REPOSITORY}openssl-client:1.1.1 -f Dockerfile-1_1_1x --target openssl-client .
 while (( i < max ))
 do
-	echo "Feld $i: Openssl 1.1.1${array[$i]}"
+	echo "Building Openssl 1.1.1${array[$i]}"
 	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}openssl-server:1.1.1${array[$i]} -f Dockerfile-1_1_1x --target openssl-server .
 	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}openssl-client:1.1.1${array[$i]} -f Dockerfile-1_1_1x --target openssl-client .
 	i=i+1

images/rustls/readme

@@ -2,8 +2,8 @@
 RUSTLS
 - versions: 
 	one version (latest) from github available
-- server successfully tested: no build script available
+- server successfully tested: latest
 - clients successfully tested: clients not available for this implementation
 
 build:      docker build -t rustls-server .
-tls server: docker run -it --rm rustls-server
+tls server: docker run -it --rm -v cert-data:/cert/:ro,nocopy rustls-server --key /cert/rsa2048key.pem --certs /cert/rsa2048cert.pem --port 4433 echo

images/tlslite_ng/readme

@@ -0,0 +1,8 @@
+---------------------------
+TLSLITE-NG
+- server successfully tested: 0.8.0-alpha40
+
+build server:   docker build -t tlslite_ng-server --target tlslite_ng-server .
+run tls server: docker run -it --rm -v cert-data:/cert/:ro,nocopy tlslite_ng-server -c /cert/rsa2048cert.pem -k /cert/rsa2048key.pem 0.0.0.0:4433
+
+build all supported tlslite-ng versions: ./tlslite_ng.sh