X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-passthrough.sh;h=e8eeffa1d283e5c26dd636755d97363b7cc2750f;hb=7eba49d24d56288d83746f3f0ce383d7c0c36552;hp=c2351d9a98ae679f13dbc8d543905ebb40306a01;hpb=412b6491a940ba3de97e5be95bd35197e51ee210;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh
index c2351d9..e8eeffa 100755
--- a/tests/tests-passthrough.sh
+++ b/tests/tests-passthrough.sh
@@ -2,7 +2,7 @@
 
 # tlsproxy tests for the -u option.
 #
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -54,11 +54,11 @@ test_proxy_successful
 test_invalid_certificate
 
 echo missing proxy certificate
-mv certificate-localhost-proxy.pem .pem
+mv certificate-localhost-proxy.pem certificate-www.localhost-proxy.pem
 # "invalid" to prevent user error if the proxy certificate gets deleted (but
 # the server certificate is still readable).
 client localhost 4712 invalid || abort 'client localhost 4712 invalid'
-mv .pem certificate-localhost-proxy.pem
+mv certificate-www.localhost-proxy.pem certificate-localhost-proxy.pem
 test_proxy_successful
 test_invalid_certificate
 
@@ -72,6 +72,7 @@ test_no_invalid_certificate
 # Stop server and try a "MITM" with a bad certificate.
 echo
 kill $pid_server || echo 'failed to kill gnutls-serv'
+sleep 3 # necessary on some systems like OpenBSD
 server_background --x509certfile "$srcdir/server-bad.pem" \
                   --x509keyfile "$srcdir/server-key.pem"
 wait_for_ports 4712
@@ -92,18 +93,18 @@ test_invalid_certificate
 tlsproxy_add localhost server.pem
 
 echo mitm missing server certificate
-mv certificate-localhost-server.pem .pem
+mv certificate-localhost-server.pem certificate-www.localhost-server.pem
 client localhost 4712 'test server bad' || abort 'client localhost 4712 test server bad'
-mv .pem certificate-localhost-server.pem
+mv certificate-www.localhost-server.pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
 
 echo mitm missing proxy certificate
-mv certificate-localhost-proxy.pem .pem
+mv certificate-localhost-proxy.pem certificate-www.localhost-proxy.pem
 # "invalid" to prevent user error if the proxy certificate gets deleted (but
 # the server certificate is still readable).
 client localhost 4712 invalid || abort 'client localhost 4712 invalid'
-mv .pem certificate-localhost-proxy.pem
+mv certificate-www.localhost-proxy.pem certificate-localhost-proxy.pem
 test_proxy_successful
 test_invalid_certificate