tests: make 'make check' pass on the source-only (WITH_SDK=0) build
Some checks failed
CI / packaging-syntax (push) Has been cancelled
CI / build-and-test (clang) (push) Has been cancelled
CI / build-and-test (gcc) (push) Has been cancelled
CI / strict-warnings (clang, -Wall -Wextra -Wpedantic -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnull-dereference -O2 -std=c11 -Werror) (push) Has been cancelled
CI / strict-warnings (gcc, -Wall -Wextra -Wpedantic -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnull-dereference -Wformat-security -Wlogical-op -Wjump-misses-init -Wdouble-promotion -O2 -std=c11 -Werror) (push) Has been cancelled
CI / sanitizers (push) Has been cancelled
CI / pie-hardening (push) Has been cancelled
CI / cross-aarch64 (push) Has been cancelled
CI / dist-reproducibility (push) Has been cancelled
CI / release (push) Has been cancelled
Some checks failed
CI / packaging-syntax (push) Has been cancelled
CI / build-and-test (clang) (push) Has been cancelled
CI / build-and-test (gcc) (push) Has been cancelled
CI / strict-warnings (clang, -Wall -Wextra -Wpedantic -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnull-dereference -O2 -std=c11 -Werror) (push) Has been cancelled
CI / strict-warnings (gcc, -Wall -Wextra -Wpedantic -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnull-dereference -Wformat-security -Wlogical-op -Wjump-misses-init -Wdouble-promotion -O2 -std=c11 -Werror) (push) Has been cancelled
CI / sanitizers (push) Has been cancelled
CI / pie-hardening (push) Has been cancelled
CI / cross-aarch64 (push) Has been cancelled
CI / dist-reproducibility (push) Has been cancelled
CI / release (push) Has been cancelled
The SDK-mode regression tests (audit, F-08/F-10/F-11/F-12, pq-box, KDF transparency) now skip cleanly when built without libzuptsdk, and the constant-time test links libzuptsdk only when present (its primitives are native). Also drop a dead 'seqs_decoded' variable in vv_ans.c that failed the exact-size test's -Werror=unused-but-set-variable. 'make check' is green source-only, so the openSUSE %check no longer blocks the build.
This commit is contained in:
parent
e1ee07f102
commit
31fa4028aa
9 changed files with 64 additions and 3 deletions
|
|
@ -2330,7 +2330,6 @@ vva_error_t vva_decode_sequences_impl(const uint8_t *src, size_t src_len,
|
||||||
? op_end - SAFEZONE_RESERVE : dst;
|
? op_end - SAFEZONE_RESERVE : dst;
|
||||||
const uint8_t *offset_check_floor = dst_base + SAFEZONE_MAX_OFFSET;
|
const uint8_t *offset_check_floor = dst_base + SAFEZONE_MAX_OFFSET;
|
||||||
|
|
||||||
size_t seqs_decoded = 0;
|
|
||||||
/* SPRINT 90 SECURITY FIX (DoS hardening):
|
/* SPRINT 90 SECURITY FIX (DoS hardening):
|
||||||
*
|
*
|
||||||
* The original loop terminated only when both lit_pos reached
|
* The original loop terminated only when both lit_pos reached
|
||||||
|
|
@ -2454,7 +2453,6 @@ vva_error_t vva_decode_sequences_impl(const uint8_t *src, size_t src_len,
|
||||||
op += litlen;
|
op += litlen;
|
||||||
lit_pos += litlen;
|
lit_pos += litlen;
|
||||||
}
|
}
|
||||||
seqs_decoded++;
|
|
||||||
|
|
||||||
/* SPRINT 63/64: continue the loop even when all matches are
|
/* SPRINT 63/64: continue the loop even when all matches are
|
||||||
* consumed, as long as literals remain. Previously this broke
|
* consumed, as long as literals remain. Previously this broke
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,14 @@
|
||||||
# Each property is checked via TWO independent paths.
|
# Each property is checked via TWO independent paths.
|
||||||
|
|
||||||
ZUPT_BIN="$(realpath ./zupt)"
|
ZUPT_BIN="$(realpath ./zupt)"
|
||||||
|
# Source-only build (WITH_SDK=0) has no libzuptsdk: the SDK-mode paths this
|
||||||
|
# test exercises are unavailable, so skip cleanly instead of failing.
|
||||||
|
_sdkck="$(mktemp -d)"
|
||||||
|
if ! "$ZUPT_BIN" keygen --sdk -o "$_sdkck/p" >/dev/null 2>&1; then
|
||||||
|
rm -rf "$_sdkck"; echo " SKIP: built without libzuptsdk (source-only) - SDK-mode test not applicable"; exit 0
|
||||||
|
fi
|
||||||
|
rm -rf "$_sdkck"
|
||||||
|
|
||||||
TMPDIR=$(mktemp -d)
|
TMPDIR=$(mktemp -d)
|
||||||
trap "rm -rf $TMPDIR" EXIT
|
trap "rm -rf $TMPDIR" EXIT
|
||||||
cd "$TMPDIR"
|
cd "$TMPDIR"
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,19 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TMP=$(mktemp -d)
|
TMP=$(mktemp -d)
|
||||||
|
# This test uses only native CT primitives (zupt_ct_memeq, ML-KEM CT compare);
|
||||||
|
# the libzuptsdk linkage is vestigial. Link it only when the vendored library
|
||||||
|
# is present (WITH_SDK builds); source-only builds compile+run without it.
|
||||||
|
SDK_LINK=""
|
||||||
|
if ls "$SDK_DIR"/libzuptsdk.so* >/dev/null 2>&1; then
|
||||||
|
SDK_LINK="-L$SDK_DIR -lzuptsdk -Wl,-rpath,$(cd "$SDK_DIR" && pwd)"
|
||||||
|
fi
|
||||||
if gcc -Iinclude -Isrc -I"$SDK_DIR/include" -Wall -Wextra -Werror $SHANI -O2 -std=c11 \
|
if gcc -Iinclude -Isrc -I"$SDK_DIR/include" -Wall -Wextra -Werror $SHANI -O2 -std=c11 \
|
||||||
tests/test_ct_timing.c \
|
tests/test_ct_timing.c \
|
||||||
src/zupt_crypto.c src/zupt_sha256.c src/zupt_sha256_shani.c src/zupt_aes256.c \
|
src/zupt_crypto.c src/zupt_sha256.c src/zupt_sha256_shani.c src/zupt_aes256.c \
|
||||||
src/zupt_xxh.c src/zupt_keccak.c src/zupt_x25519.c src/zupt_mlkem.c \
|
src/zupt_xxh.c src/zupt_keccak.c src/zupt_x25519.c src/zupt_mlkem.c \
|
||||||
src/zupt_cpuid.c src/zupt_mlock.c \
|
src/zupt_cpuid.c src/zupt_mlock.c \
|
||||||
-L"$SDK_DIR" -lzuptsdk -Wl,-rpath,"$(cd "$SDK_DIR" && pwd)" -lm \
|
$SDK_LINK -lm \
|
||||||
-o "$TMP/t" 2>"$TMP/cc.log"; then
|
-o "$TMP/t" 2>"$TMP/cc.log"; then
|
||||||
"$TMP/t"; rc=$?
|
"$TMP/t"; rc=$?
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,14 @@ set -u
|
||||||
PASS=0
|
PASS=0
|
||||||
FAIL=0
|
FAIL=0
|
||||||
ZUPT="${ZUPT_BIN:-./zupt}"
|
ZUPT="${ZUPT_BIN:-./zupt}"
|
||||||
|
# Source-only build (WITH_SDK=0) has no libzuptsdk: the SDK-mode paths this
|
||||||
|
# test exercises are unavailable, so skip cleanly instead of failing.
|
||||||
|
_sdkck="$(mktemp -d)"
|
||||||
|
if ! "$ZUPT" keygen --sdk -o "$_sdkck/p" >/dev/null 2>&1; then
|
||||||
|
rm -rf "$_sdkck"; echo " SKIP: built without libzuptsdk (source-only) - SDK-mode test not applicable"; exit 0
|
||||||
|
fi
|
||||||
|
rm -rf "$_sdkck"
|
||||||
|
|
||||||
# Resolve to absolute path so the test continues to find the binary after cd.
|
# Resolve to absolute path so the test continues to find the binary after cd.
|
||||||
case "$ZUPT" in
|
case "$ZUPT" in
|
||||||
/*) ;;
|
/*) ;;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,14 @@
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
ZUPT="${ZUPT_BIN:-./zupt}"
|
ZUPT="${ZUPT_BIN:-./zupt}"
|
||||||
|
# Source-only build (WITH_SDK=0) has no libzuptsdk: the SDK-mode paths this
|
||||||
|
# test exercises are unavailable, so skip cleanly instead of failing.
|
||||||
|
_sdkck="$(mktemp -d)"
|
||||||
|
if ! "$ZUPT" keygen --sdk -o "$_sdkck/p" >/dev/null 2>&1; then
|
||||||
|
rm -rf "$_sdkck"; echo " SKIP: built without libzuptsdk (source-only) - SDK-mode test not applicable"; exit 0
|
||||||
|
fi
|
||||||
|
rm -rf "$_sdkck"
|
||||||
|
|
||||||
case "$ZUPT" in
|
case "$ZUPT" in
|
||||||
/*) ;;
|
/*) ;;
|
||||||
*) ZUPT="$PWD/$ZUPT" ;;
|
*) ZUPT="$PWD/$ZUPT" ;;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,14 @@
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
ZUPT="${ZUPT_BIN:-./zupt}"
|
ZUPT="${ZUPT_BIN:-./zupt}"
|
||||||
|
# Source-only build (WITH_SDK=0) has no libzuptsdk: the SDK-mode paths this
|
||||||
|
# test exercises are unavailable, so skip cleanly instead of failing.
|
||||||
|
_sdkck="$(mktemp -d)"
|
||||||
|
if ! "$ZUPT" keygen --sdk -o "$_sdkck/p" >/dev/null 2>&1; then
|
||||||
|
rm -rf "$_sdkck"; echo " SKIP: built without libzuptsdk (source-only) - SDK-mode test not applicable"; exit 0
|
||||||
|
fi
|
||||||
|
rm -rf "$_sdkck"
|
||||||
|
|
||||||
case "$ZUPT" in
|
case "$ZUPT" in
|
||||||
/*) ;;
|
/*) ;;
|
||||||
*) ZUPT="$PWD/$ZUPT" ;;
|
*) ZUPT="$PWD/$ZUPT" ;;
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,14 @@
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
ZUPT="${ZUPT_BIN:-./zupt}"
|
ZUPT="${ZUPT_BIN:-./zupt}"
|
||||||
|
# Source-only build (WITH_SDK=0) has no libzuptsdk: the SDK-mode paths this
|
||||||
|
# test exercises are unavailable, so skip cleanly instead of failing.
|
||||||
|
_sdkck="$(mktemp -d)"
|
||||||
|
if ! "$ZUPT" keygen --sdk -o "$_sdkck/p" >/dev/null 2>&1; then
|
||||||
|
rm -rf "$_sdkck"; echo " SKIP: built without libzuptsdk (source-only) - SDK-mode test not applicable"; exit 0
|
||||||
|
fi
|
||||||
|
rm -rf "$_sdkck"
|
||||||
|
|
||||||
case "$ZUPT" in
|
case "$ZUPT" in
|
||||||
/*) ;;
|
/*) ;;
|
||||||
*) ZUPT="$PWD/$ZUPT" ;;
|
*) ZUPT="$PWD/$ZUPT" ;;
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,14 @@
|
||||||
|
|
||||||
set -u
|
set -u
|
||||||
SDK_DIR="${ZUPTSDK_DIR:-vendor/zuptsdk}"
|
SDK_DIR="${ZUPTSDK_DIR:-vendor/zuptsdk}"
|
||||||
|
# Source-only build (WITH_SDK=0) has no libzuptsdk: the SDK-mode paths this
|
||||||
|
# test exercises are unavailable, so skip cleanly instead of failing.
|
||||||
|
_sdkck="$(mktemp -d)"
|
||||||
|
if ! ls "$SDK_DIR"/libzuptsdk.so* >/dev/null 2>&1; then
|
||||||
|
rm -rf "$_sdkck"; echo " SKIP: built without libzuptsdk (source-only) - SDK-mode test not applicable"; exit 0
|
||||||
|
fi
|
||||||
|
rm -rf "$_sdkck"
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i686" ]; then
|
if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i686" ]; then
|
||||||
SHANI="-msha -mssse3 -msse4.1"
|
SHANI="-msha -mssse3 -msse4.1"
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,14 @@ bad() { echo " ✗ $1"; F=$((F+1)); }
|
||||||
T=$(mktemp -d)
|
T=$(mktemp -d)
|
||||||
FX=/tmp/bench/fixtures
|
FX=/tmp/bench/fixtures
|
||||||
BIN=./vaptvupt
|
BIN=./vaptvupt
|
||||||
|
# Source-only build (WITH_SDK=0) has no libzuptsdk: the SDK-mode paths this
|
||||||
|
# test exercises are unavailable, so skip cleanly instead of failing.
|
||||||
|
_sdkck="$(mktemp -d)"
|
||||||
|
if ! "$BIN" keygen --box -o "$_sdkck/p" >/dev/null 2>&1; then
|
||||||
|
rm -rf "$_sdkck"; echo " SKIP: built without libzuptsdk (source-only) - SDK-mode test not applicable"; exit 0
|
||||||
|
fi
|
||||||
|
rm -rf "$_sdkck"
|
||||||
|
|
||||||
|
|
||||||
echo "pq-box mode (ZUPT_ENC_PQ_BOX_V1)"
|
echo "pq-box mode (ZUPT_ENC_PQ_BOX_V1)"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue