X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-normal.sh;h=1d8f07bc8ef1e1ab752ae50560de68a8beb567bc;hb=948878cf1d882adef61f9bd7c26473089f3032ad;hp=b059fac21fde741f744cf2ed2420f5fec2025c31;hpb=cb3745997fd431ff7bf303c20ed0e8a62cb8bd80;p=tlsproxy%2Ftlsproxy.git diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh index b059fac..1d8f07b 100755 --- 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-2012 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 @@ -48,16 +48,20 @@ 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 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. @@ -88,16 +92,20 @@ 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 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