]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
tests: don't check against 3DES if disabled in openssl
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 31 Dec 2016 12:27:10 +0000 (13:27 +0100)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Sat, 31 Dec 2016 13:51:09 +0000 (14:51 +0100)
tests/suite/testcompat-main-openssl

index f6ed067ae23adf870e185ef59a3477cf29ec13a5..1e48d95233b6af651ca3c30c8dca48762887b9b6 100755 (executable)
@@ -71,6 +71,9 @@ HAVE_SSL3=$?
 ${SERV} ciphers -v ALL 2>&1|grep -e CAMELLIA >/dev/null 2>&1
 NO_CAMELLIA=$?
 
+${SERV} ciphers -v ALL 2>&1|grep -e 3DES >/dev/null 2>&1
+NO_3DES=$?
+
 ${SERV} ciphers -v ALL 2>&1|grep -e DSS >/dev/null 2>&1
 NO_DSS=$?
 
@@ -158,9 +161,11 @@ run_client_suite() {
        wait_server ${PID}
 
        # Test TLS 1.0 with RSA ciphersuite
-       echo "${PREFIX}Checking TLS 1.0 with RSA and 3DES-CBC..."
-       ${VALGRIND} "${CLI}" ${DEBUG} -p "${PORT}" 127.0.0.1 --priority "NONE:+3DES-CBC:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+RSA${ADD}" --insecure --x509certfile "${CLI_CERT}" --x509keyfile "${CLI_KEY}" </dev/null >/dev/null || \
-               fail ${PID} "Failed"
+       if test "${NO_3DES}" != 1; then
+               echo "${PREFIX}Checking TLS 1.0 with RSA and 3DES-CBC..."
+               ${VALGRIND} "${CLI}" ${DEBUG} -p "${PORT}" 127.0.0.1 --priority "NONE:+3DES-CBC:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+RSA${ADD}" --insecure --x509certfile "${CLI_CERT}" --x509keyfile "${CLI_KEY}" </dev/null >/dev/null || \
+                       fail ${PID} "Failed"
+       fi
 
        echo "${PREFIX}Checking TLS 1.0 with RSA and AES-128-CBC..."
        ${VALGRIND} "${CLI}" ${DEBUG} -p "${PORT}" 127.0.0.1 --priority "NONE:+AES-128-CBC:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+RSA${ADD}" --insecure --x509certfile "${CLI_CERT}" --x509keyfile "${CLI_KEY}" </dev/null >/dev/null || \