upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-13 20:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9.20] fix: test: Disable keyfromlabel collision avoidance in tests

Browse source 
With the collision avoidance on, some of the tests would occasionally
fail. None of the tests using keyfromlabel are revoking the keys so it
should be safe to disable it.

Closes #5554

Backport of MR !11066

Merge branch 'backport-5554-disable-keyfromlabel-collision-avoidance-in-tests-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!11074
This commit is contained in:
Nicki Křížek 2025-10-10 13:07:27 +02:00
commit 190240d4ec
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/system/enginepkcs11/setup.sh
View file

@ -40,7 +40,7 @@ keyfromlabel() {
dir="$4"
shift 4
$KEYFRLAB $ENGINE_ARG -K $dir -a $alg -l "pkcs11:token=softhsm2-enginepkcs11;object=${id}-${zone};pin-source=$PWD/ns1/pin" "$@" $zone >>keyfromlabel.out.$zone.$id 2>keyfromlabel.err.$zone.$id || return 1
$KEYFRLAB $ENGINE_ARG -K $dir -a $alg -y -l "pkcs11:token=softhsm2-enginepkcs11;object=${id}-${zone};pin-source=$PWD/ns1/pin" "$@" $zone >>keyfromlabel.out.$zone.$id 2>keyfromlabel.err.$zone.$id || return 1
cat keyfromlabel.out.$zone.$id
}

1
bin/tests/system/keyfromlabel/tests_keyfromlabel.py
View file

@ -139,6 +139,7 @@ def test_keyfromlabel(alg_name, alg_type, alg_bits):
*os.environ.get("ENGINE_ARG", "").split(),
"-a",
alg_name,
"-y",
"-l",
f"pkcs11:token=softhsm2-keyfromlabel;object={key_id}-{zone};pin-source=pin",
*key_flag,