summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2021-06-17 13:01:58 +0200
committerWerner Zeh <werner.zeh@siemens.com>2021-06-28 04:13:54 +0000
commitc44ffc30846fdfa7cf814316d24dfecd2c22b0ae (patch)
tree4ce81f5791b3da23460cd0a8a5cf10f21ba61bd9
parentc05aa26a1fc472e121ca1b6b6a3510323ae53e34 (diff)
downloadcoreboot-c44ffc30846fdfa7cf814316d24dfecd2c22b0ae.tar.gz
coreboot-c44ffc30846fdfa7cf814316d24dfecd2c22b0ae.tar.bz2
coreboot-c44ffc30846fdfa7cf814316d24dfecd2c22b0ae.zip
security/intel/cbnt: Build test CBnT provisioning
This updates the intel-sec-tools submodule pointer to include a fake acm binary to be included for buildtesting. Change-Id: Id4a9e177f71306b8c5538a578da229a53d19487a Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/55609 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
m---------3rdparty/intel-sec-tools0
-rw-r--r--configs/config.ocp_deltalake_cbnt8
-rw-r--r--util/testing/Makefile.inc1
3 files changed, 9 insertions, 0 deletions
diff --git a/3rdparty/intel-sec-tools b/3rdparty/intel-sec-tools
-Subproject ae3a2cfb27eb18176d6a19720327f3f0c839de4
+Subproject 0031ac73447baeb197fb2d80e5fba2470716e76
diff --git a/configs/config.ocp_deltalake_cbnt b/configs/config.ocp_deltalake_cbnt
new file mode 100644
index 000000000000..4df1043709b4
--- /dev/null
+++ b/configs/config.ocp_deltalake_cbnt
@@ -0,0 +1,8 @@
+CONFIG_VENDOR_OCP=y
+CONFIG_INTEL_TXT_BIOSACM_FILE="3rdparty/intel-sec-tools/testdata/fake_acm/biosacm_cbnt_fake.bin"
+CONFIG_INTEL_TXT_LOGGING=y
+CONFIG_INTEL_CBNT_SUPPORT=y
+# CONFIG_INTEL_CBNT_CBNT_PROV_KM_USE_CFG_FILE is not set
+# CONFIG_INTEL_CBNT_CBNT_PROV_BPM_USE_CFG_FILE is not set
+CONFIG_INTEL_CBNT_KM_PRIV_KEY_FILE="3rdparty/intel-sec-tools/testdata/testkeys/km_priv_key.pem"
+CONFIG_INTEL_CBNT_BPM_PRIV_KEY_FILE="3rdparty/intel-sec-tools/testdata/testkeys/bpm_priv_key.pem"
diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc
index 0d1053a72f50..a390654045da 100644
--- a/util/testing/Makefile.inc
+++ b/util/testing/Makefile.inc
@@ -85,6 +85,7 @@ ifneq ($(JENKINS_SKIP_LINT_TESTS),y)
util/lint/lint lint-stable --junit
util/lint/lint lint-extended --junit
endif
+ cd 3rdparty/intel-sec-tools/ ; go mod vendor
util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/chromeos $(ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml
util/abuild/abuild -o $(COREBOOT_BUILD_DIR)/default $(ABUILD_OPTIONS)
$(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR="util/$(tool)" BLD="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; )