summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2010-03-16 23:07:13 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2010-03-16 23:45:37 +0100
commitdf861cb8ae97288177c6a8188afbeed5b770cbfc (patch)
tree6103650f649c462cc6b88c079378e9ecb9ee7307 /tests
parent65f77ad16aa4fbc3db0ef50c01eec467592711d6 (diff)
downloadgnutls-df861cb8ae97288177c6a8188afbeed5b770cbfc.tar.gz
made SAFE_RENEGOTIATION flags explicit.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/safe-renegotiation/testsrn10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/safe-renegotiation/testsrn b/tests/safe-renegotiation/testsrn
index 1ffd64a0c7..42176d7831 100755
--- a/tests/safe-renegotiation/testsrn
+++ b/tests/safe-renegotiation/testsrn
@@ -33,16 +33,16 @@ fail() {
echo "Checking Safe renegotiation"
-$SERV -p $PORT --echo --priority NORMAL:+ANON-DH --dhparams $srcdir/params.dh >/dev/null 2>&1 &
+$SERV -p $PORT --echo --priority NORMAL:+ANON-DH:%SAFE_RENEGOTIATION --dhparams $srcdir/params.dh >/dev/null 2>&1 &
pid=$!
# give the server a chance to initialize
sleep 2
-$CLI -p $PORT 127.0.0.1 --rehandshake --priority NONE:+AES-128-CBC:+MD5:+SHA1:+VERS-SSL3.0:+ANON-DH:+COMP-NULL </dev/null >/dev/null 2>&1 || \
+$CLI -p $PORT 127.0.0.1 --rehandshake --priority NONE:+AES-128-CBC:+MD5:+SHA1:+VERS-SSL3.0:+ANON-DH:+COMP-NULL:%SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
fail "0. Renegotiation should have succeeded!"
-$CLI -p $PORT 127.0.0.1 --rehandshake --priority NORMAL:+ANON-DH </dev/null >/dev/null 2>&1 || \
+$CLI -p $PORT 127.0.0.1 --rehandshake --priority NORMAL:+ANON-DH:%SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
fail "1. Safe rehandshake should have succeeded!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority NORMAL:+ANON-DH:%UNSAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
@@ -64,7 +64,7 @@ pid=$!
# give the server a chance to initialize
sleep 2
-$CLI -p $PORT 127.0.0.1 --rehandshake --priority NORMAL:+ANON-DH </dev/null >/dev/null 2>&1 || \
+$CLI -p $PORT 127.0.0.1 --rehandshake --priority NORMAL:+ANON-DH:%SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
fail "5. Safe rehandshake should have succeeded!"
$CLI -p $PORT 127.0.0.1 --rehandshake --priority NORMAL:+ANON-DH:%UNSAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \
@@ -85,7 +85,7 @@ pid=$!
# give the server a chance to initialize
sleep 2
-$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH </dev/null >/dev/null 2>&1 && \
+$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH:%SAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 && \
fail "9. Initial connection should have failed!"
$CLI -p $PORT 127.0.0.1 --priority NORMAL:+ANON-DH:%UNSAFE_RENEGOTIATION </dev/null >/dev/null 2>&1 || \