Commit 31f6d95c authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

certs: unify blacklist_hashes.c and blacklist_nohashes.c 



These two files are very similar. Unify them.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarMickaël Salaün <mic@linux.microsoft.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 9008a676

certs/Makefile

+5 −7
Original line number Diff line number Diff line
@@ -4,24 +4,22 @@ 
#



obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o

obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o

obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o blacklist_hashes.o

obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o

ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),)



$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list

CFLAGS_blacklist_hashes.o := -I $(obj)



quiet_cmd_check_and_copy_blacklist_hash_list = GEN     $@

      cmd_check_and_copy_blacklist_hash_list = \

	$(if $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST), \

	$(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \

	cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@

	{ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST); echo $(comma) NULL; } > $@, \

	echo NULL > $@)



$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE

	$(call if_changed,check_and_copy_blacklist_hash_list)

obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o

else

obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o

endif



targets += blacklist_hash_list



quiet_cmd_extract_certs  = CERT    $@

certs/blacklist_hashes.c

+0 −1
Original line number Diff line number Diff line
@@ -3,5 +3,4 @@ 


const char __initconst *const blacklist_hashes[] = {

#include "blacklist_hash_list"

	, NULL

};

certs/blacklist_nohashes.c

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "blacklist.h"



const char __initconst *const blacklist_hashes[] = {

	NULL

};