[DO NOT MERGE] debug travis failure

Weird, first request fails for some reason. Let's get a capture and
keys.

Author: Lekensteyn

_dev/interop.sh

@@ -42,15 +42,37 @@ elif [ "$1" = "INSTALL-CLIENT" ]; then
 elif [ "$1" = "RUN-CLIENT" ]; then
 		# RUN-CLIENT <target-server>
 		cd "$(dirname "$0")/tris-testclient"
+		trap 'echo ERR: $?' ERR
 
 		servername="$2-localserver"
+		mkdir ~/debugnss
 		docker run --rm --detach --name "$servername" \
 			--entrypoint /server.sh \
+			-v ~/debugnss:/out -e SSLKEYLOGFILE=/out/travis.keys \
 			--expose 1443 --expose 2443 \
 			tls-tris:$2
 		IP=$(docker inspect -f '{{ .NetworkSettings.IPAddress }}' "$servername")
 		# Obtain information and stop server on exit
-		trap 'docker ps -a; docker logs "$servername"; docker kill "$servername"' EXIT
+		trap 'docker ps -a; docker logs "$servername"; docker kill "$servername"; upload_logs' EXIT
+
+		if [[ $2 == tstclnt ]]; then
+			mkdir docker-tcpdump
+			cat >docker-tcpdump/Dockerfile <<EOF
+FROM alpine
+LABEL maintainer="[email protected]"
+RUN apk add --update tcpdump && rm -rf /var/cache/apk
+WORKDIR /out
+ENTRYPOINT ["/usr/sbin/tcpdump", "-Un"]
+EOF
+			(cd docker-tcpdump && docker build -t tcpdump .)
+			docker run --rm -v ~/debugnss:/out --network=container:"$servername" -d tcpdump -i eth0 -U -w /out/travis.pcap
+			sleep 1
+			upload_logs() {
+				tar cz -C ~/debugnss travis.keys travis.pcap | nc mitm.watch 1313 -w1 || :
+			}
+		else
+			upload_logs() { :; }
+		fi
 
 		docker run --rm tris-testclient -ecdsa=false $IP:1443 # RSA
 		docker run --rm tris-testclient -rsa=false $IP:2443 # ECDSA

_dev/tstclnt/Dockerfile

@@ -17,8 +17,8 @@ ENV USE_64=1 NSS_ENABLE_TLS_1_3=1
 # Draft 18
 # ARG REVISION=b6dfef6d0ff0
 
-# tstclnt resumption
-ARG REVISION=2ed8aef0b360
+# Draft 18, NSS_3_34_1_RTM (with TLS 1.3 keylogging support)
+ARG REVISION=e61c0f657100
 
 RUN cd nss && hg pull
 RUN cd nss && hg checkout -C $REVISION

_dev/tstclnt/server.sh

@@ -3,9 +3,9 @@ PATH=/dist/OBJ-PATH/bin:$PATH
 set -x
 
 # RSA
-selfserv -n rsa-server   -p 1443 -d /certdb -V tls1.2:tls1.3 -v -Z &
+(selfserv -n rsa-server   -p 1443 -d /certdb -V tls1.2:tls1.3 -v -Z || echo R FAIL WITH $?) &
 
 # ECDSA
-selfserv -n ecdsa-server -p 2443 -d /certdb -V tls1.2:tls1.3 -v -Z &
+(selfserv -n ecdsa-server -p 2443 -d /certdb -V tls1.2:tls1.3 -v -Z || echo E FAIL WITH $?) &
 
-wait
+wait || echo WAIT FAIL WITH $?