Add missing guards for gnuTLS

This commit is contained in:
Paul Bakker 2015-02-08 16:18:35 +01:00
parent daae3b749b
commit 539d972a25

View file

@ -1222,6 +1222,7 @@ run_test "Renegotiation: openssl server, client-initiated" \
-C "error" \ -C "error" \
-c "HTTP/1.0 200 [Oo][Kk]" -c "HTTP/1.0 200 [Oo][Kk]"
requires_gnutls
run_test "Renegotiation: gnutls server strict, client-initiated" \ run_test "Renegotiation: gnutls server strict, client-initiated" \
"$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \ "$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \
"$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1" \ "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1" \
@ -1233,6 +1234,7 @@ run_test "Renegotiation: gnutls server strict, client-initiated" \
-C "error" \ -C "error" \
-c "HTTP/1.0 200 [Oo][Kk]" -c "HTTP/1.0 200 [Oo][Kk]"
requires_gnutls
run_test "Renegotiation: gnutls server unsafe, client-initiated default" \ run_test "Renegotiation: gnutls server unsafe, client-initiated default" \
"$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \ "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
"$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1" \ "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1" \
@ -1244,6 +1246,7 @@ run_test "Renegotiation: gnutls server unsafe, client-initiated default" \
-c "error" \ -c "error" \
-C "HTTP/1.0 200 [Oo][Kk]" -C "HTTP/1.0 200 [Oo][Kk]"
requires_gnutls
run_test "Renegotiation: gnutls server unsafe, client-inititated no legacy" \ run_test "Renegotiation: gnutls server unsafe, client-inititated no legacy" \
"$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \ "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
"$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1 \ "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1 \
@ -1256,6 +1259,7 @@ run_test "Renegotiation: gnutls server unsafe, client-inititated no legacy" \
-c "error" \ -c "error" \
-C "HTTP/1.0 200 [Oo][Kk]" -C "HTTP/1.0 200 [Oo][Kk]"
requires_gnutls
run_test "Renegotiation: gnutls server unsafe, client-inititated legacy" \ run_test "Renegotiation: gnutls server unsafe, client-inititated legacy" \
"$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \ "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
"$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1 \ "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1 \
@ -1270,6 +1274,7 @@ run_test "Renegotiation: gnutls server unsafe, client-inititated legacy" \
# Test for the "secure renegotation" extension only (no actual renegotiation) # Test for the "secure renegotation" extension only (no actual renegotiation)
requires_gnutls
run_test "Renego ext: gnutls server strict, client default" \ run_test "Renego ext: gnutls server strict, client default" \
"$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \ "$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \
"$P_CLI debug_level=3" \ "$P_CLI debug_level=3" \
@ -1278,6 +1283,7 @@ run_test "Renego ext: gnutls server strict, client default" \
-C "error" \ -C "error" \
-c "HTTP/1.0 200 [Oo][Kk]" -c "HTTP/1.0 200 [Oo][Kk]"
requires_gnutls
run_test "Renego ext: gnutls server unsafe, client default" \ run_test "Renego ext: gnutls server unsafe, client default" \
"$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \ "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
"$P_CLI debug_level=3" \ "$P_CLI debug_level=3" \
@ -1286,6 +1292,7 @@ run_test "Renego ext: gnutls server unsafe, client default" \
-C "error" \ -C "error" \
-c "HTTP/1.0 200 [Oo][Kk]" -c "HTTP/1.0 200 [Oo][Kk]"
requires_gnutls
run_test "Renego ext: gnutls server unsafe, client break legacy" \ run_test "Renego ext: gnutls server unsafe, client break legacy" \
"$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \ "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
"$P_CLI debug_level=3 allow_legacy=-1" \ "$P_CLI debug_level=3 allow_legacy=-1" \
@ -1294,6 +1301,7 @@ run_test "Renego ext: gnutls server unsafe, client break legacy" \
-c "error" \ -c "error" \
-C "HTTP/1.0 200 [Oo][Kk]" -C "HTTP/1.0 200 [Oo][Kk]"
requires_gnutls
run_test "Renego ext: gnutls client strict, server default" \ run_test "Renego ext: gnutls client strict, server default" \
"$P_SRV debug_level=3" \ "$P_SRV debug_level=3" \
"$G_CLI --priority=NORMAL:%SAFE_RENEGOTIATION" \ "$G_CLI --priority=NORMAL:%SAFE_RENEGOTIATION" \
@ -1301,6 +1309,7 @@ run_test "Renego ext: gnutls client strict, server default" \
-s "received TLS_EMPTY_RENEGOTIATION_INFO\|found renegotiation extension" \ -s "received TLS_EMPTY_RENEGOTIATION_INFO\|found renegotiation extension" \
-s "server hello, secure renegotiation extension" -s "server hello, secure renegotiation extension"
requires_gnutls
run_test "Renego ext: gnutls client unsafe, server default" \ run_test "Renego ext: gnutls client unsafe, server default" \
"$P_SRV debug_level=3" \ "$P_SRV debug_level=3" \
"$G_CLI --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \ "$G_CLI --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
@ -1308,6 +1317,7 @@ run_test "Renego ext: gnutls client unsafe, server default" \
-S "received TLS_EMPTY_RENEGOTIATION_INFO\|found renegotiation extension" \ -S "received TLS_EMPTY_RENEGOTIATION_INFO\|found renegotiation extension" \
-S "server hello, secure renegotiation extension" -S "server hello, secure renegotiation extension"
requires_gnutls
run_test "Renego ext: gnutls client unsafe, server break legacy" \ run_test "Renego ext: gnutls client unsafe, server break legacy" \
"$P_SRV debug_level=3 allow_legacy=-1" \ "$P_SRV debug_level=3 allow_legacy=-1" \
"$G_CLI --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \ "$G_CLI --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \