Minor code cleanup.

[tlsproxy/tlsproxy.git] / tests / tests-normal.sh

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index a8169dcd2f8dcfefca9ba175d00ba0b6070f0f91..44eda5b17883b3fa4da5c9e7a0d5fd3cc7dbd315 100755 (executable)
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -2,7 +2,7 @@
 
 # Normal tlsproxy tests.
 #
-# Copyright (C) 2011  Simon Ruderich
+# Copyright (C) 2011-2013  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
@@ -18,20 +18,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# Handle empty $srcdir.
-[ "x$srcdir" = x ] && srcdir=.
-
-. $srcdir/common.sh
+test "x$srcdir" = x && srcdir=.
+. "$srcdir/common.sh"
 
 
 # Create necessary files.
 cleanup
-$srcdir/../src/tlsproxy-setup >/dev/null 2>/dev/null
+"$srcdir/../src/tlsproxy-setup" >/dev/null 2>/dev/null
 
 # Normal tests.
 ../src/tlsproxy -d2 4711 >/dev/null &
-server --x509certfile $srcdir/server.pem \
-       --x509keyfile $srcdir/server-key.pem
+server --x509certfile "$srcdir/server.pem" \
+       --x509keyfile "$srcdir/server-key.pem"
 sleep 1
 
 
@@ -46,20 +44,25 @@ test_proxy_successful
 test_invalid_certificate
 
 # Create the proxy certificate.
-$srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
+"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
     >/dev/null 2>/dev/null
-rm -f certificate-localhost-server.pem
 
 echo missing server certificate
+mv certificate-localhost-server.pem .pem
 client localhost 4712 invalid || abort
+mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
 
-# Create the proxy and server certificate.
-$srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
-    >/dev/null 2>/dev/null
+echo missing proxy certificate
+mv certificate-localhost-proxy.pem .pem
+client localhost 4712 invalid || abort
+mv .pem certificate-localhost-proxy.pem
+test_proxy_successful
+test_invalid_certificate
 
 echo normal connection
+# 'localhost' is the CN of tlsproxy's certificate.
 client localhost 4712 localhost || abort
 test_proxy_successful
 test_no_invalid_certificate
@@ -68,8 +71,8 @@ test_no_invalid_certificate
 # Stop server and try a "MITM" with a bad certificate.
 echo
 pkill -n gnutls-serv
-server --x509certfile $srcdir/server-bad.pem \
-       --x509keyfile $srcdir/server-key.pem
+server --x509certfile "$srcdir/server-bad.pem" \
+       --x509keyfile "$srcdir/server-key.pem"
 sleep 1
 rm -f certificate-localhost-proxy.pem certificate-localhost-server.pem
 
@@ -85,18 +88,22 @@ test_proxy_successful
 test_invalid_certificate
 
 # Create the proxy certificate.
-$srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
+"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
     >/dev/null 2>/dev/null
-rm -f certificate-localhost-server.pem
 
 echo mitm missing server certificate
+mv certificate-localhost-server.pem .pem
 client localhost 4712 invalid || abort
+mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
 
-# Create the proxy and server certificate.
-$srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
-    >/dev/null 2>/dev/null
+echo mitm missing proxy certificate
+mv certificate-localhost-proxy.pem .pem
+client localhost 4712 invalid || abort
+mv .pem certificate-localhost-proxy.pem
+test_proxy_successful
+test_invalid_certificate
 
 echo mitm normal connection
 client localhost 4712 invalid || abort
@@ -104,9 +111,7 @@ test_proxy_successful
 test_invalid_certificate
 
 
-pkill -n gnutls-serv
-pkill -n tlsproxy
-
+stop_servers
 cleanup
 rm -f tmp