From 177b7410ac8c84fe7d2d9252cbbb462120a9eca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Fri, 6 Oct 2023 16:09:40 +0200
Subject: [PATCH] Skip side-channel tests of rsa-sec-decrypt when built with
mini-gmp.
---
ChangeLog | 6 ++++++
testsuite/rsa-sec-decrypt-test.c | 4 ++++
testsuite/sc-valgrind.sh | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 99661930..278de08b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2023-10-06 Niels Möller <nisse@lysator.liu.se>
+ * testsuite/rsa-sec-decrypt-test.c (test_main): Skip side-channel
+ test if built with mini-gmp.
+
+ * testsuite/sc-valgrind.sh (with_valgrind): Pass
+ --exit-on-first-error=yes.
+
* aclocal.m4 (NETTLE_PROG_VALGRIND): New macro.
* configure.ac: Use it.
* testsuite/Makefile.in (TS_SH): Include side-channel tests only
diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c
index f257723b..cc5d49aa 100644
--- a/testsuite/rsa-sec-decrypt-test.c
+++ b/testsuite/rsa-sec-decrypt-test.c
@@ -70,6 +70,10 @@ test_main(void)
mpz_t garbage;
unsigned count;
+#if NETTLE_USE_MINI_GMP
+ if (test_side_channel)
+ SKIP();
+#endif
rsa_private_key_init(&key);
rsa_public_key_init(&pub);
mpz_init(gibberish);
diff --git a/testsuite/sc-valgrind.sh b/testsuite/sc-valgrind.sh
index 39e2e941..61fb7c7d 100644
--- a/testsuite/sc-valgrind.sh
+++ b/testsuite/sc-valgrind.sh
@@ -2,6 +2,6 @@
# using valgrind.
with_valgrind () {
- type valgrind >/dev/null || exit 77
- NETTLE_TEST_SIDE_CHANNEL=1 valgrind -q --error-exitcode=1 "$@"
+ type valgrind >/dev/null 2>&1 || exit 77
+ NETTLE_TEST_SIDE_CHANNEL=1 valgrind -q --exit-on-first-error=yes --error-exitcode=1 "$@"
}
--
GitLab