talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

swtpm: fixup tpm2_avoid_da_lockout test

Browse Source 
After libtpms got bumped to 0.10.1, `test_tpm2_avoid_da_lockout` would
start breaking:
```
swtpm> FAIL: test_tpm2_avoid_da_lockout
swtpm> ================================
swtpm>
swtpm> Need to be root to run test with CUSE interface.
swtpm> ==== Starting swtpm with interfaces socket+socket ====
swtpm> Error: Did not get expected result from TPM2_NV_Write
swtpm> expected:  80 01 00 00 00 0a 00 00 09 22
swtpm> received:  80 01 00 00 00 0a 00 00 09 8e
swtpm> _test_tpm2_avoid_da_lockout: line 17: 11905 Killed                  ${SWTPM_EXE} socket "$@" ${SWTPM_TEST_SECCOMP_OPT:+${SWTPM_TEST_SECCOMP_OPT}} --server "type=tcp,port=${SWTPM_SERVER_PORT}${swtpm_server_disconnect}" --ctrl "type=tcp,port=${SWTPM_CTRL_PORT}"
swtpm> FAIL test_tpm2_avoid_da_lockout (exit status: 1)
```

This adopts the upstream patch fixing the test.
This commit is contained in:
Arthur Gautier 2025-06-11 09:40:28 -07:00
parent 3908c92c23
commit d1357baf08
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/by-name/sw/swtpm/package.nix
View File

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
autoreconfHook, autoreconfHook,
pkg-config, pkg-config,
libtasn1, libtasn1,
@ -35,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-N79vuI0FhawLyQtwVF6ABIvCmEaYefq/YkyrafUfUHE="; hash = "sha256-N79vuI0FhawLyQtwVF6ABIvCmEaYefq/YkyrafUfUHE=";
}; };
patches = [
(fetchpatch {
name = "retry-nwwrite.patch";
url = "https://github.com/stefanberger/swtpm/commit/4da66c66f92438443e66b67555673c9cb898b0ae.patch";
hash = "sha256-TTS+ViN4g6EfNLrhvGPobcSQEbr/mEl9ZLZTWdxbifs=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
unixtools.netstat unixtools.netstat