From: Krenzelok Frantisek <krenzelok.frantisek@gmail.com>
Date: Tue, 11 Mar 2025 10:38:47 +0000 (+0100)
Subject: kTLS: fix gnutls-cli-debug - test
X-Git-Tag: 3.8.10~26^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93d1fe12e52a382bd024b0db51482f0c7272bb2a;p=thirdparty%2Fgnutls.git

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 ad8e525e30..b140cd3bc4 100644
--- 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 6544d1e2e0..2c06c8d669 100644
--- 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 c09e676c6a..82f4d4d111 100755
--- 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