diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2021-03-31 12:21:32 +0200 |
|---|---|---|
| committer | Arthur Heymans <arthur@aheymans.xyz> | 2021-05-11 08:30:49 +0000 |
| commit | 8b91c9f286a87537fcf75a8c9bea96c943c14c51 (patch) | |
| tree | 28db4f3f0402d9a366b1f0be1d51ec04cd32d564 /src/security | |
| parent | 780f82f50e22a29244499833b6f1488e015253cf (diff) | |
security/intel/cbnt/Makefile.inc: Use variables for hash alg
Change-Id: I4113b1496e99c10017fc1d85a4acbbc16d32ea41
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51975
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/security')
| -rw-r--r-- | src/security/intel/cbnt/Makefile.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/security/intel/cbnt/Makefile.inc b/src/security/intel/cbnt/Makefile.inc index c20a3dddcd..b0ff9be329 100644 --- a/src/security/intel/cbnt/Makefile.inc +++ b/src/security/intel/cbnt/Makefile.inc @@ -2,6 +2,12 @@ ifeq ($(CONFIG_INTEL_CBNT_SUPPORT),y) ramstage-y += cmos.c +# As specified in Intel Trusted Execution Technology and Boot Guard Server BIOS +# Specification, document number # 558294 +PK_HASH_ALG_SHA1:=4 +PK_HASH_ALG_SHA256:=11 +PK_HASH_ALG_SHA384:=12 + # The private key also contains the public key, so use that if a private key is provided. ifeq ($(CONFIG_INTEL_CBNT_NEED_KM_PRIV_KEY),y) $(obj)/km_pub.pem: $(call strip_quotes, $(CONFIG_INTEL_CBNT_KM_PRIV_KEY_FILE)) @@ -41,7 +47,6 @@ $(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV) $(CBNT_CFG) else $(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV) printf " CBNT_PROV creating unsigned BPM\n" - # SHA256, SHA1, SHA384 for digest $(CBNT_PROV) bpm-gen $@ $< --revision=$(CONFIG_INTEL_CBNT_BPM_REVISION) \ --svn=$(CONFIG_INTEL_CBNT_BPM_SVN) \ --acmsvn=$(CONFIG_INTEL_CBNT_ACM_SVN) \ @@ -49,7 +54,7 @@ $(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV) --pbet=$(CONFIG_INTEL_CBNT_PBET) \ --ibbflags=$(CONFIG_INTEL_CBNT_IBB_FLAGS) \ --entrypoint=$(shell printf "%d" 0xfffffff0) \ - --ibbhash=11,4,12 \ + --ibbhash=$(PK_HASH_ALG_SHA256),$(PK_HASH_ALG_SHA1),$(PK_HASH_ALG_SHA384) \ --coreboot \ --sinitmin=$(CONFIG_INTEL_CBNT_SINIT_SVN) \ --txtflags=0 \ @@ -103,7 +108,6 @@ $(obj)/km_unsigned.bin: $(obj)/km_pub.pem $(CBNT_PROV) $(CBNT_CFG) printf " CBNT_PROV creating unsigned KM using config file\n" $(CBNT_PROV) km-gen $@ $< --config=$(CBNT_CFG) else -PK_HASH_ALG_SHA256:=11 # Hardcode as no other options are available for CBnT $(obj)/km_unsigned.bin: $(obj)/km_pub.pem $(obj)/bpm_pub.pem $(CBNT_PROV) printf " CBNT_PROV creating unsigned KM\n" $(CBNT_PROV) km-gen $@ $< --revision=$(CONFIG_INTEL_CBNT_KM_REVISION) \ |