Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
certs: unify blacklist_hashes.c and blacklist_nohashes.c
These two files are very similar. Unify them.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Mickaël Salaün <mic@linux.microsoft.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
+5
-14
+5
-7
certs/Makefile
+5
-7
certs/Makefile
···
4
4
#
5
5
6
6
obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
7
-
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o
7
+
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o blacklist_hashes.o
8
8
obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o
9
-
ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),)
10
9
11
10
$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list
12
11
CFLAGS_blacklist_hashes.o := -I $(obj)
13
12
14
13
quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@
15
14
cmd_check_and_copy_blacklist_hash_list = \
15
+
$(if $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST), \
16
16
$(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \
17
-
cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@
17
+
{ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST); echo $(comma) NULL; } > $@, \
18
+
echo NULL > $@)
18
19
19
20
$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE
20
21
$(call if_changed,check_and_copy_blacklist_hash_list)
21
-
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
22
-
else
23
-
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
24
-
endif
22
+
25
23
targets += blacklist_hash_list
26
24
27
25
quiet_cmd_extract_certs = CERT $@
-1
certs/blacklist_hashes.c
-1
certs/blacklist_hashes.c