From 580b6777a6a264dc18ecb1810b3472307d6106a4 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sat, 17 Sep 2011 22:30:50 +0200 Subject: [PATCH] tests/tests-*.sh: Remove unnecessary calls to tlsproxy-add. --- tests/tests-normal.sh | 14 ++++---------- tests/tests-passthrough.sh | 14 ++++---------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh index b059fac..314d798 100755 --- a/tests/tests-normal.sh +++ b/tests/tests-normal.sh @@ -48,17 +48,14 @@ test_invalid_certificate # Create the proxy certificate. $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 normal connection # 'localhost' is the CN of tlsproxy's certificate. client localhost 4712 localhost || abort @@ -88,17 +85,14 @@ test_invalid_certificate # Create the proxy certificate. $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 normal connection client localhost 4712 invalid || abort test_proxy_successful diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh index 4c6d63c..0407d41 100755 --- a/tests/tests-passthrough.sh +++ b/tests/tests-passthrough.sh @@ -48,17 +48,14 @@ test_invalid_certificate # Create the proxy certificate. $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 'test server' || 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 normal connection # 'localhost' is the CN of tlsproxy's certificate. client localhost 4712 localhost || abort @@ -88,17 +85,14 @@ test_invalid_certificate # Create the proxy certificate. $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 'test server bad' || 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 normal connection client localhost 4712 invalid || abort test_proxy_successful -- 2.44.1