From 539d972a25954bf0b1e9de6f0b3baa54f1a7e3d6 Mon Sep 17 00:00:00 2001
From: Paul Bakker <paul_github.com@offspark.com>
Date: Sun, 8 Feb 2015 16:18:35 +0100
Subject: [PATCH] Add missing guards for gnuTLS

---
 tests/ssl-opt.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 6813754bc..ebe1cec21 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1222,6 +1222,7 @@ run_test    "Renegotiation: openssl server, client-initiated" \
             -C "error" \
             -c "HTTP/1.0 200 [Oo][Kk]"
 
+requires_gnutls
 run_test    "Renegotiation: gnutls server strict, client-initiated" \
             "$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \
             "$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 "HTTP/1.0 200 [Oo][Kk]"
 
+requires_gnutls
 run_test    "Renegotiation: gnutls server unsafe, client-initiated default" \
             "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
             "$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 "HTTP/1.0 200 [Oo][Kk]"
 
+requires_gnutls
 run_test    "Renegotiation: gnutls server unsafe, client-inititated no legacy" \
             "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
             "$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 "HTTP/1.0 200 [Oo][Kk]"
 
+requires_gnutls
 run_test    "Renegotiation: gnutls server unsafe, client-inititated legacy" \
             "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
             "$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)
 
+requires_gnutls
 run_test    "Renego ext: gnutls server strict, client default" \
             "$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \
             "$P_CLI debug_level=3" \
@@ -1278,6 +1283,7 @@ run_test    "Renego ext: gnutls server strict, client default" \
             -C "error" \
             -c "HTTP/1.0 200 [Oo][Kk]"
 
+requires_gnutls
 run_test    "Renego ext: gnutls server unsafe, client default" \
             "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
             "$P_CLI debug_level=3" \
@@ -1286,6 +1292,7 @@ run_test    "Renego ext: gnutls server unsafe, client default" \
             -C "error" \
             -c "HTTP/1.0 200 [Oo][Kk]"
 
+requires_gnutls
 run_test    "Renego ext: gnutls server unsafe, client break legacy" \
             "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
             "$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 "HTTP/1.0 200 [Oo][Kk]"
 
+requires_gnutls
 run_test    "Renego ext: gnutls client strict, server default" \
             "$P_SRV debug_level=3" \
             "$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 "server hello, secure renegotiation extension"
 
+requires_gnutls
 run_test    "Renego ext: gnutls client unsafe, server default" \
             "$P_SRV debug_level=3" \
             "$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 "server hello, secure renegotiation extension"
 
+requires_gnutls
 run_test    "Renego ext: gnutls client unsafe, server break legacy" \
             "$P_SRV debug_level=3 allow_legacy=-1" \
             "$G_CLI --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \