kTLS: fix gnutls-cli-debug - test

Signed-off-by: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>

diff --git a/src/cli-debug.c b/src/cli-debug.c
index ad8e525e304d2e573b333496c96ef4e772801446..b140cd3bc418234e3b91030b8241c2d170146868 100644 (file)
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -67,6 +67,11 @@ static void tls_log_func(int level, const char *str)
        fprintf(stderr, "|<%d>| %s", level, str);
 }
 
+static void tls_audit_log_func(gnutls_session_t session, const char *str)
+{
+       fprintf(stderr, "|<%p>| %s", session, str);
+}
+
 typedef test_code_t (*TEST_FUNC)(gnutls_session_t);
 
 typedef struct {
@@ -277,6 +282,7 @@ int main(int argc, char **argv)
        }
 
        gnutls_global_set_log_function(tls_log_func);
+       gnutls_global_set_audit_log_function(tls_audit_log_func);
        gnutls_global_set_log_level(debug);
 
        /* get server name */

diff --git a/src/tests.c b/src/tests.c
index 6544d1e2e01a5181b684b00d1bd82c685808f1db..2c06c8d669872414529e07bcae8937a12855c2ba 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -1770,7 +1770,9 @@ static test_code_t test_do_handshake_and_send_record(gnutls_session_t session)
                return ret;
 
        gnutls_record_send(session, snd_buf, sizeof(snd_buf) - 1);
-       ret = gnutls_record_recv(session, buf, sizeof(buf) - 1);
+       do {
+               ret = gnutls_record_recv(session, buf, sizeof(buf) - 1);
+       } while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
        if (ret < 0)
                return TEST_FAILED;
 

diff --git a/tests/gnutls-cli-debug.sh b/tests/gnutls-cli-debug.sh
index c09e676c6acf1f157a07c2949aa498b6d6bad4be..82f4d4d11106556cc54ab3fe180eb3c06ba18847 100755 (executable)
--- a/tests/gnutls-cli-debug.sh
+++ b/tests/gnutls-cli-debug.sh
@@ -26,6 +26,7 @@
 : ${TIMEOUT=timeout}
 OUTFILE=cli-debug.$$.tmp
 TMPFILE=config.$$.tmp
+LOGFILE="$(basename "$0" .sh).log"
 unset RETCODE
 
 if ! test -x "${SERV}"; then
@@ -71,7 +72,7 @@ PID=$!
 wait_server ${PID}
 
 "$TIMEOUT" 1800 \
-"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>&1 || fail ${PID} "gnutls-cli-debug run should have succeeded!"
+"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>$LOGFILE  || fail ${PID} "gnutls-cli-debug run should have succeeded!"
 
 kill ${PID}
 wait
@@ -118,7 +119,7 @@ PID=$!
 wait_server ${PID}
 
 "$TIMEOUT" 1800 \
-"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>&1 || fail ${PID} "gnutls-cli-debug run should have succeeded!"
+"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>$LOGFILE  || fail ${PID} "gnutls-cli-debug run should have succeeded!"
 
 kill ${PID}
 wait
@@ -160,7 +161,7 @@ PID=$!
 wait_server ${PID}
 
 "$TIMEOUT" 1800 \
-"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>&1 || fail ${PID} "gnutls-cli-debug run should have succeeded!"
+"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>$LOGFILE  || fail ${PID} "gnutls-cli-debug run should have succeeded!"
 
 kill ${PID}
 wait
@@ -186,7 +187,7 @@ _EOF_
 
 GNUTLS_SYSTEM_PRIORITY_FILE="${TMPFILE}" \
 "$TIMEOUT" 1800 \
-"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>&1 || fail ${PID} "gnutls-cli-debug run should have succeeded!"
+"${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>$LOGFILE  || fail ${PID} "gnutls-cli-debug run should have succeeded!"
 
 kill ${PID}
 wait
@@ -209,7 +210,7 @@ if test "${ENABLE_GOST}" = "1" && test "${GNUTLS_FORCE_FIPS_MODE}" != 1 ; then
        wait_server ${PID}
 
        "$TIMEOUT" 1800 \
-       "${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>&1 || fail ${PID} "gnutls-cli-debug run should have succeeded!"
+       "${DCLI}" --attime "2017-08-9" -p "${PORT}" localhost >$OUTFILE 2>$LOGFILE  || fail ${PID} "gnutls-cli-debug run should have succeeded!"
 
        kill ${PID}
        wait