Commit 340a0253 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

certs: move scripts/extract-cert to certs/ 



extract-cert is only used in certs/Makefile.

Move it there and build extract-cert on demand.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 129ab0d2

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -4410,7 +4410,6 @@ L: keyrings@vger.kernel.org 
S:	Maintained

F:	Documentation/admin-guide/module-signing.rst

F:	certs/

F:	scripts/extract-cert.c

F:	scripts/sign-file.c









CFAG12864B LCD DRIVER
































certs/.gitignore



+1
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









/extract-cert









/x509_certificate_list









/x509_revocation_list
























certs/Makefile



+9
−4






























Original line number
Diff line number
Diff line







@@ -13,11 +13,11 @@ obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o







endif



















quiet_cmd_extract_certs  = CERT    $@









      cmd_extract_certs  = scripts/extract-cert $(2) $@









      cmd_extract_certs  = $(obj)/extract-cert $(2) $@



















$(obj)/system_certificates.o: $(obj)/x509_certificate_list



















$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) scripts/extract-cert FORCE









$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE









	$(call if_changed,extract_certs,$(if $(CONFIG_SYSTEM_TRUSTED_KEYS),$<,""))



















targets += x509_certificate_list








@@ -74,7 +74,7 @@ endif

















$(obj)/system_certificates.o: $(obj)/signing_key.x509



















$(obj)/signing_key.x509: $(X509_DEP) scripts/extract-cert FORCE









$(obj)/signing_key.x509: $(X509_DEP) $(obj)/extract-cert FORCE









	$(call if_changed,extract_certs,$(if $(X509_DEP),$<,$(CONFIG_MODULE_SIG_KEY)))









endif # CONFIG_MODULE_SIG


















@@ -82,7 +82,12 @@ targets += signing_key.x509

















$(obj)/revocation_certificates.o: $(obj)/x509_revocation_list



















$(obj)/x509_revocation_list: $(CONFIG_SYSTEM_REVOCATION_KEYS) scripts/extract-cert FORCE









$(obj)/x509_revocation_list: $(CONFIG_SYSTEM_REVOCATION_KEYS) $(obj)/extract-cert FORCE









	$(call if_changed,extract_certs,$(if $(CONFIG_SYSTEM_REVOCATION_KEYS),$<,""))



















targets += x509_revocation_list



















hostprogs := extract-cert



















HOSTCFLAGS_extract-cert.o = $(shell pkg-config --cflags libcrypto 2> /dev/null)









HOSTLDLIBS_extract-cert = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto)
























scripts/extract-cert.c→certs/extract-cert.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -29,7 +29,7 @@ static __attribute__((noreturn))







void format(void)









{









	fprintf(stderr,









		"Usage: scripts/extract-cert <source> <dest>\n");









		"Usage: extract-cert <source> <dest>\n");









	exit(2);









}










































scripts/.gitignore



+0
−1






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









/asn1_compiler









/bin2c









/extract-cert









/insert-sys-cert









/kallsyms









/module.lds