From baa7f078098dc3dd4e6a49cc1b46e83fe6dff9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 20 Aug 2014 20:15:53 +0200 Subject: [PATCH] Add GnuTLS support to ssl-opt.sh --- tests/ssl-opt.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index ed0f19cb0..d435ee6b9 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -14,9 +14,13 @@ set -u : ${P_SRV:=../programs/ssl/ssl_server2} : ${P_CLI:=../programs/ssl/ssl_client2} : ${OPENSSL_CMD:=openssl} # OPENSSL would conflict with the build system +: ${GNUTLS_CLI:=gnutls-cli} +: ${GNUTLS_SERV:=gnutls-serv} O_SRV="$OPENSSL_CMD s_server -www -cert data_files/server5.crt -key data_files/server5.key" O_CLI="echo 'GET / HTTP/1.0' | $OPENSSL_CMD s_client" +G_SRV="$GNUTLS_SERV --x509certfile data_files/server5.crt --x509keyfile data_files/server5.key" +G_CLI="$GNUTLS_CLI" TESTS=0 FAILS=0 @@ -76,6 +80,20 @@ requires_openssl_with_sslv2() { fi } +# skip next test if GnuTLS isn't available +requires_gnutls() { + if [ -z "${GNUTLS_AVAILABLE:-}" ]; then + if ( which "$GNUTLS_CLI" && which "$GNUTLS_SERV" ) >/dev/null; then + GNUTLS_AVAILABLE="YES" + else + GNUTLS_AVAILABLE="NO" + fi + fi + if [ "$GNUTLS_AVAILABLE" = "NO" ]; then + SKIP_NEXT="YES" + fi +} + # print_name print_name() { echo -n "$1 " @@ -320,6 +338,8 @@ P_SRV="$P_SRV server_port=$PORT" P_CLI="$P_CLI server_port=$PORT" O_SRV="$O_SRV -accept $PORT" O_CLI="$O_CLI -connect localhost:$PORT" +G_SRV="$G_SRV -p $PORT" +G_CLI="$G_CLI -p $PORT" # Also pick a unique name for intermediate files SRV_OUT="srv_out.$$" @@ -561,6 +581,13 @@ run_test "Max fragment length #3" \ -S "server hello, max_fragment_length extension" \ -C "found max_fragment_length extension" +run_test "Max fragment length #4 (GnuTLS server)" \ + "$G_SRV" \ + "$P_CLI debug_level=4 max_frag_len=4096" \ + 0 \ + -c "client hello, adding max_fragment_length extension" \ + -c "found max_fragment_length extension" + # Tests for renegotiation run_test "Renegotiation #0 (none)" \