Message ID | 20220611172233.1494073-4-masahiroy@kernel.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [1/4] certs/blacklist_hashes.c: fix const confusion in certs blacklist | expand |
On 11/06/2022 19:22, Masahiro Yamada wrote: > 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> > --- > > certs/Makefile | 12 +++++------- > certs/blacklist_hashes.c | 1 - > certs/blacklist_nohashes.c | 6 ------ > 3 files changed, 5 insertions(+), 14 deletions(-) > delete mode 100644 certs/blacklist_nohashes.c > > diff --git a/certs/Makefile b/certs/Makefile > index df7aaeafd19c..7068d45db807 100644 > --- a/certs/Makefile > +++ b/certs/Makefile > @@ -4,24 +4,22 @@ > # > > obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o > -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o > +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.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 $@ > diff --git a/certs/blacklist_hashes.c b/certs/blacklist_hashes.c > index 86d66fe11348..0c5476abebd9 100644 > --- a/certs/blacklist_hashes.c > +++ b/certs/blacklist_hashes.c > @@ -3,5 +3,4 @@ > > const char __initconst *const blacklist_hashes[] = { > #include "blacklist_hash_list" > - , NULL > }; > diff --git a/certs/blacklist_nohashes.c b/certs/blacklist_nohashes.c > deleted file mode 100644 > index 753b703ef0ef..000000000000 > --- a/certs/blacklist_nohashes.c > +++ /dev/null > @@ -1,6 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -#include "blacklist.h" > - > -const char __initconst *const blacklist_hashes[] = { > - NULL > -};
On Sun, Jun 12, 2022 at 02:22:33AM +0900, Masahiro Yamada wrote: > These two files are very similar. Unify them. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > certs/Makefile | 12 +++++------- > certs/blacklist_hashes.c | 1 - > certs/blacklist_nohashes.c | 6 ------ > 3 files changed, 5 insertions(+), 14 deletions(-) > delete mode 100644 certs/blacklist_nohashes.c > > diff --git a/certs/Makefile b/certs/Makefile > index df7aaeafd19c..7068d45db807 100644 > --- a/certs/Makefile > +++ b/certs/Makefile > @@ -4,24 +4,22 @@ > # > > obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o > -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o > +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.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 $@ > diff --git a/certs/blacklist_hashes.c b/certs/blacklist_hashes.c > index 86d66fe11348..0c5476abebd9 100644 > --- a/certs/blacklist_hashes.c > +++ b/certs/blacklist_hashes.c > @@ -3,5 +3,4 @@ > > const char __initconst *const blacklist_hashes[] = { > #include "blacklist_hash_list" > - , NULL > }; > diff --git a/certs/blacklist_nohashes.c b/certs/blacklist_nohashes.c > deleted file mode 100644 > index 753b703ef0ef..000000000000 > --- a/certs/blacklist_nohashes.c > +++ /dev/null > @@ -1,6 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -#include "blacklist.h" > - > -const char __initconst *const blacklist_hashes[] = { > - NULL > -}; > -- > 2.32.0 > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> BR, Jarkko
diff --git a/certs/Makefile b/certs/Makefile index df7aaeafd19c..7068d45db807 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -4,24 +4,22 @@ # obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.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 $@ diff --git a/certs/blacklist_hashes.c b/certs/blacklist_hashes.c index 86d66fe11348..0c5476abebd9 100644 --- a/certs/blacklist_hashes.c +++ b/certs/blacklist_hashes.c @@ -3,5 +3,4 @@ const char __initconst *const blacklist_hashes[] = { #include "blacklist_hash_list" - , NULL }; diff --git a/certs/blacklist_nohashes.c b/certs/blacklist_nohashes.c deleted file mode 100644 index 753b703ef0ef..000000000000 --- a/certs/blacklist_nohashes.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "blacklist.h" - -const char __initconst *const blacklist_hashes[] = { - NULL -};
These two files are very similar. Unify them. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- certs/Makefile | 12 +++++------- certs/blacklist_hashes.c | 1 - certs/blacklist_nohashes.c | 6 ------ 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 certs/blacklist_nohashes.c