Fixes the "GUI functions don't work on GNU Guix" report and a batch of
adversarial-audit findings across the CLI, decoder, crypto and packaging.
GUI (gui/src/zupt_gui.py)
- Root cause of the broken GUI: every encryption path defaulted to the
libzuptsdk "SDK v2" modes, which are absent from the source-only build and
exit 1. Reworked Keys/Compress/Extract around the native modes with a
build-aware PQ-mode selector: Hybrid (--pq, default), Full PQ (--pq-only),
and SDK v2 only when the binary reports WITH_SDK support. Capability is
detected from `version` ("Build:"/"KDF:" lines) with a `help` fallback.
- Extract/Verify gain a PQ private-key input with auto-detect (reads the
archive via `info` to pick --pq vs --pq-only). Verify could not verify any
PQ archive before (password field only).
- run_async now holds a LIST of in-flight (thread, worker) refs; DiskTab's two
buttons previously shared one slot, so a second op GC'd the first QThread
mid-run. About tab corrected (codec 2.60.4, PBKDF2 default, --pq-only, URL).
CLI (src/zupt_main.c)
- compress -p <archive> <files> swallowed the archive name as the password and
truncated the first input file (silent data loss, exit 0). Added a
data-loss guard: refuse to overwrite an existing non-.zupt file as the output
archive unless -y/--force; plus a self-overwrite guard.
- compress <archive> <src> -p <pw> wrote an UNENCRYPTED archive (exit 0)
because options after the first positional were treated as files. Now errors
on a misplaced option (with a `--` escape for real dashed filenames).
- Removed duplicated dead --pq-box/--pq-sdk branches. version/banner/usage now
state the build's real KDF (PBKDF2 on source-only) and repo URL; examples
lead with native --pq / --pq-only.
Security (audit findings)
- vv_decoder.c: the two AVX2 fast-path token decoders read a 2-/3-byte match
offset after only checking 1 byte remained -> heap over-read on a crafted
archive. Added the `ip + off_bytes > ip_end` guard the tail path already had.
- zupt_crypto.c: wipe ML-KEM/X25519 secret-key buffers when hybrid decrypt
init fails on key read (matches the pq-only path).
- zupt_format.c: bound attacker-controlled encryption_header_off before the
(off_t)+7 arithmetic in the info enc_type reader (avoid signed-overflow UB).
Packaging (would fail source-only)
- debian/rules (staged into debian/zupt, installed vendored .so), aur/PKGBUILD,
nix/flake.nix, homebrew (vendored .so + nonexistent AUDIT.md, stale /zupt
URLs) now build source-only. opensuse spec %files ships the shell completions
make install writes (rpmbuild no longer fails on unpackaged files);
_service + debian/control point at the vaptvupt repo; KDF claim corrected.
Cross-platform GUI packaging (new)
- packaging/portable/: OS-agnostic GUI package (zupt_gui.py + .bat/.command/.sh
launchers + README) that runs on Windows/macOS/Linux/BSD with Python+PySide6.
- .github/workflows/cross-platform.yml: builds real native binaries on
windows-latest + macos-latest runners (CLI, PyInstaller GUI, Inno Setup
installer, .dmg) and the portable zip, attaching them to the release on tag.
- packaging/windows/vaptvupt-gui.iss: Inno Setup installer script.
Validation: make check 16/16 (all distro-safe checks), GUI imports + command
contracts verified against the fixed CLI. test_help_consistency updated to
assert the truthful (build-aware) default KDF.
110 lines
3.5 KiB
Nix
110 lines
3.5 KiB
Nix
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
#
|
|
# Nix flake for zupt.
|
|
#
|
|
# Usage (with flakes enabled):
|
|
# nix build .#zupt # build the package
|
|
# nix run .#zupt -- version # run zupt directly
|
|
# nix develop # drop into a dev shell
|
|
# nix flake check # lint the flake
|
|
#
|
|
# To consume from another flake:
|
|
# inputs.zupt.url = "git+https://git.securityops.co/cristiancmoises/zupt?ref=v2.4.4";
|
|
# ...packages.x86_64-linux.default = inputs.zupt.packages.x86_64-linux.zupt;
|
|
#
|
|
# Reproducibility:
|
|
# * Nix already pins the source tree by hash.
|
|
# * `make dist` is also reproducible (tests/test_dist_reproducible.sh).
|
|
# * Together, two independent Nix evaluations of the same flake.lock
|
|
# produce byte-identical /nix/store outputs.
|
|
|
|
{
|
|
description = "Zupt — post-quantum backup compression utility (C11)";
|
|
|
|
inputs = {
|
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
|
flake-utils.url = "github:numtide/flake-utils";
|
|
};
|
|
|
|
outputs = { self, nixpkgs, flake-utils }:
|
|
flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
|
|
let
|
|
pkgs = import nixpkgs { inherit system; };
|
|
|
|
zupt = pkgs.stdenv.mkDerivation {
|
|
pname = "vaptvupt";
|
|
version = "4.2.1";
|
|
|
|
# When publishing, replace this with `fetchurl` against the
|
|
# release tarball. For local development the flake assumes it
|
|
# lives in the same directory as the source.
|
|
src = ./.;
|
|
|
|
nativeBuildInputs = with pkgs; [
|
|
gcc
|
|
gnumake
|
|
];
|
|
|
|
# python3 is only used by the regression-test harness.
|
|
checkInputs = [ pkgs.python3 ];
|
|
|
|
# Build with the project's preferred warning set on top of Nix's
|
|
# hardening flags. Don't override -O2 from stdenv.
|
|
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -std=c11";
|
|
|
|
# Source-only build (WITH_SDK=0): native crypto, no vendored libraries.
|
|
buildPhase = ''
|
|
runHook preBuild
|
|
make WITH_SDK=0 -j$NIX_BUILD_CORES
|
|
runHook postBuild
|
|
'';
|
|
|
|
# Distro-safe regression subset. Disable with doCheck = false;.
|
|
doCheck = true;
|
|
checkPhase = ''
|
|
runHook preCheck
|
|
make WITH_SDK=0 check
|
|
runHook postCheck
|
|
'';
|
|
|
|
installPhase = ''
|
|
runHook preInstall
|
|
make DESTDIR=$out PREFIX= WITH_SDK=0 install
|
|
|
|
# Docs
|
|
mkdir -p $out/share/doc/vaptvupt
|
|
cp README.md SECURITY.md CHANGELOG.md $out/share/doc/vaptvupt/
|
|
runHook postInstall
|
|
'';
|
|
|
|
meta = with pkgs.lib; {
|
|
description = "Post-quantum backup compression utility (ML-KEM-768 + X25519 + AES-256-CTR + HMAC-SHA256)";
|
|
homepage = "https://git.securityops.co/cristiancmoises/vaptvupt";
|
|
license = with licenses; [ agpl3Plus gpl3Plus ];
|
|
maintainers = [ ];
|
|
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
|
mainProgram = "vaptvupt";
|
|
};
|
|
};
|
|
in {
|
|
packages = {
|
|
zupt = zupt;
|
|
default = zupt;
|
|
};
|
|
|
|
apps.default = {
|
|
type = "app";
|
|
program = "${zupt}/bin/zupt";
|
|
};
|
|
|
|
devShells.default = pkgs.mkShell {
|
|
buildInputs = with pkgs; [
|
|
gcc
|
|
gnumake
|
|
python3
|
|
valgrind
|
|
gdb
|
|
];
|
|
};
|
|
});
|
|
}
|