#
# 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
#
# 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
-../src/tlsproxy -d2 -u 4711 >/dev/null &
-server --x509certfile $srcdir/server.pem \
- --x509keyfile $srcdir/server-key.pem
-sleep 1
+tlsproxy -u 4711
+server --x509certfile "$srcdir/server.pem" \
+ --x509keyfile "$srcdir/server-key.pem"
+wait_for_ports 4711 4712
mv certificate-localhost-proxy.pem .pem
# "invalid" to prevent user error if the proxy certificate gets deleted (but
# the server certificate is still readable).
mv certificate-localhost-proxy.pem .pem
# "invalid" to prevent user error if the proxy certificate gets deleted (but
# the server certificate is still readable).
-pkill -n gnutls-serv
-server --x509certfile $srcdir/server-bad.pem \
- --x509keyfile $srcdir/server-key.pem
-sleep 1
+kill $pid_server || echo 'failed to kill gnutls-serv'
+server --x509certfile "$srcdir/server-bad.pem" \
+ --x509keyfile "$srcdir/server-key.pem"
+wait_for_ports 4712
mv certificate-localhost-proxy.pem .pem
# "invalid" to prevent user error if the proxy certificate gets deleted (but
# the server certificate is still readable).
mv certificate-localhost-proxy.pem .pem
# "invalid" to prevent user error if the proxy certificate gets deleted (but
# the server certificate is still readable).