vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binman: Use bintool wrappers for PKCS#11 tools in tests

Browse Source 
The PKCS#11 signing tests in ftest.py call tools.run('softhsm2-util', ...)
directly (and the equivalent for pkcs11-tool and p11-kit), even though
the test setup has already constructed the corresponding Bintool
instances. As Quentin Schulz observed on v1, the bintool wrapper for
these tools is currently used only as an "is this installed?" probe.

Route the eight remaining call sites in ftest.py through
<bintool>.run_cmd(...), which the Bintool base class already provides.
The change is test-side only; no production binman code calls these
tools.

Suggested-by: Quentin Schulz <quentin.schulz@cherry.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2026-05-11 12:05:10 -06:00
parent 44f9ccfdad
commit 08bcf962c5
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/binman/ftest.py
+23 -23
View File
@@ -7581,7 +7581,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
self._CheckBintool(p11_kit)
p11_kit_config = configparser.ConfigParser()
out = tools.run('p11-kit', 'print-config')
out = p11_kit.run_cmd('print-config')
p11_kit_config.read_string(out)
softhsm2_lib = p11_kit_config.get('softhsm2', 'module',
fallback=None)
@@ -7590,16 +7590,16 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
with unittest.mock.patch.dict('os.environ',
{'SOFTHSM2_CONF': softhsm2_conf,
'PKCS11_MODULE_PATH': softhsm2_lib}):
tools.run('softhsm2-util', '--init-token', '--free', '--label',
'U-Boot token', '--pin', '1111', '--so-pin',
'222222')
tools.run('pkcs11-tool', '--module', softhsm2_lib,
'--write-object', cert_file, '--pin', '1111',
'--type', 'cert', '--id', '999999', '--label',
'test_cert', '--login')
tools.run('softhsm2-util', '--import', private_key, '--token',
'U-Boot token', '--label', 'test_key', '--id', '999999',
'--pin', '1111')
softhsm2_util.run_cmd('--init-token', '--free', '--label',
'U-Boot token', '--pin', '1111',
'--so-pin', '222222')
pkcs11_tool.run_cmd('--module', softhsm2_lib,
'--write-object', cert_file, '--pin', '1111',
'--type', 'cert', '--id', '999999', '--label',
'test_cert', '--login')
softhsm2_util.run_cmd('--import', private_key, '--token',
'U-Boot token', '--label', 'test_key',
'--id', '999999', '--pin', '1111')
data = self._DoReadFile('capsule/signed_pkcs11.dts')
self._CheckCapsule(data, signed_capsule=True)
@@ -8251,12 +8251,12 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
with unittest.mock.patch.dict('os.environ',
{'SOFTHSM2_CONF': softhsm2_conf}):
tools.run('softhsm2-util', '--init-token', '--free', '--label',
'U-Boot token', '--pin', '1111', '--so-pin',
'222222')
tools.run('softhsm2-util', '--import', private_key, '--token',
'U-Boot token', '--label', 'test_key', '--id', '999999',
'--pin', '1111')
softhsm2_util.run_cmd('--init-token', '--free', '--label',
'U-Boot token', '--pin', '1111',
'--so-pin', '222222')
softhsm2_util.run_cmd('--import', private_key, '--token',
'U-Boot token', '--label', 'test_key',
'--id', '999999', '--pin', '1111')
# Make sure the private key can only be accessed through the engine
os.remove(private_key)
@@ -8326,12 +8326,12 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
with unittest.mock.patch.dict('os.environ',
{'SOFTHSM2_CONF': softhsm2_conf}):
tools.run('softhsm2-util', '--init-token', '--free', '--label',
'U-Boot prod token', '--pin', '1234', '--so-pin',
'222222')
tools.run('softhsm2-util', '--import', private_key, '--token',
'U-Boot prod token', '--label', 'prod', '--id', '999999',
'--pin', '1234')
softhsm2_util.run_cmd('--init-token', '--free', '--label',
'U-Boot prod token', '--pin', '1234',
'--so-pin', '222222')
softhsm2_util.run_cmd('--import', private_key, '--token',
'U-Boot prod token', '--label', 'prod',
'--id', '999999', '--pin', '1234')
# Make sure the private key can only be accessed through the engine
os.remove(private_key)