History

Merge tag 'tpmdd-next-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm fixes from Jarkko Sakkinen: "Two fixes for this merge window" * tag 'tpmdd-next-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd: certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build certs/blacklist_hashes.c: fix const confusion in certs blacklist

Linus Torvalds committed 4 years ago

Commit afe9eb12 parents 979086f 27b5b223 files · +13 −13Browse files

Unified · Split

3 files
  1. certs/.gitignore +1 −1
  2. certs/Makefile +10 −10
  3. certs/blacklist_hashes.c +2 −2
certs/.gitignore+1−1
@@ -1,5 +1,5 @@
1# SPDX-License-Identifier: GPL-2.0-only1# SPDX-License-Identifier: GPL-2.0-only
2/blacklist_hashes_checked2/blacklist_hash_list
3/extract-cert3/extract-cert
4/x509_certificate_list4/x509_certificate_list
5/x509_revocation_list5/x509_revocation_list
certs/Makefile+10−10
@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c · 6 unmodified lines
7obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o7obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o
8obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o8obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o
9ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),)9ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),)
10quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2))
11 cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@
12 10
13$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST))11$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list
12CFLAGS_blacklist_hashes.o := -I $(obj)
14 13
15$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked14quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@
15 cmd_check_and_copy_blacklist_hash_list = \
16 $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \
17 cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@
16 18
17CFLAGS_blacklist_hashes.o += -I$(srctree)19$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE
18 20 $(call if_changed,check_and_copy_blacklist_hash_list)
19targets += blacklist_hashes_checked
20$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
21 $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
22obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o21obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
23else22else
24obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o23obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
25endif24endif
25targets += blacklist_hash_list
26 26
27quiet_cmd_extract_certs = CERT $@27quiet_cmd_extract_certs = CERT $@
28 cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@28 cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@
@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list · 4 unmodified lines
33$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE33$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE
34 $(call if_changed,extract_certs)34 $(call if_changed,extract_certs)
35 35
36targets += x509_certificate_list blacklist_hashes_checked36targets += x509_certificate_list
37 37
38# If module signing is requested, say by allyesconfig, but a key has not been38# If module signing is requested, say by allyesconfig, but a key has not been
39# supplied, then one will need to be generated to make sure the build does not39# supplied, then one will need to be generated to make sure the build does not
certs/blacklist_hashes.c+2−2
@@ -1,7 +1,7 @@
1// SPDX-License-Identifier: GPL-2.01// SPDX-License-Identifier: GPL-2.0
2#include "blacklist.h"2#include "blacklist.h"
3 3
4const char __initdata *const blacklist_hashes[] = {4const char __initconst *const blacklist_hashes[] = {
5#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST5#include "blacklist_hash_list"
6 , NULL6 , NULL
7};7};