# Normal tlsproxy tests.
#
-# 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
# Create necessary files.
cleanup
-"$srcdir/../src/tlsproxy-setup" >/dev/null 2>/dev/null
+tlsproxy_setup
# Normal tests.
-tlsproxy 4711
-server --x509certfile "$srcdir/server.pem" \
- --x509keyfile "$srcdir/server-key.pem"
+tlsproxy_background 4711
+server_background --x509certfile "$srcdir/server.pem" \
+ --x509keyfile "$srcdir/server-key.pem"
wait_for_ports 4711 4712
test_invalid_certificate
# Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
- >/dev/null 2>/dev/null
+tlsproxy_add localhost server.pem
echo missing server certificate
mv certificate-localhost-server.pem .pem
test_invalid_certificate
echo missing proxy certificate
-mv certificate-localhost-proxy.pem .pem
+mv certificate-localhost-proxy.pem certificate-www.localhost-proxy.pem
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
# Stop server and try a "MITM" with a bad certificate.
echo
kill $pid_server || echo 'failed to kill gnutls-serv'
-server --x509certfile "$srcdir/server-bad.pem" \
- --x509keyfile "$srcdir/server-key.pem"
+sleep 3 # necessary on some systems like OpenBSD
+server_background --x509certfile "$srcdir/server-bad.pem" \
+ --x509keyfile "$srcdir/server-key.pem"
wait_for_ports 4712
rm -f certificate-localhost-proxy.pem certificate-localhost-server.pem
test_invalid_certificate
# Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
- >/dev/null 2>/dev/null
+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 invalid || abort 'client localhost 4712 invalid'
-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
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
test_invalid_certificate
-stop_servers
+# stop_servers in trap-handler
cleanup
exit 0