summaryrefslogtreecommitdiffstats
path: root/certs
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2022-09-12 15:52:10 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2022-09-24 04:31:18 +0900
commit2154aca21408752eaa3eeaf2ba6e942724ff2a4d (patch)
tree61e6cce7e24161083061157c37429505b5795c24 /certs
parent03764b30a4f0185a97515d616e60e2e00c558583 (diff)
downloadlinux-2154aca21408752eaa3eeaf2ba6e942724ff2a4d.tar.gz
linux-2154aca21408752eaa3eeaf2ba6e942724ff2a4d.tar.bz2
linux-2154aca21408752eaa3eeaf2ba6e942724ff2a4d.zip
certs: make system keyring depend on built-in x509 parser
Commit e90886291c7c ("certs: make system keyring depend on x509 parser") is not the right fix because x509_load_certificate_list() can be modular. The combination of CONFIG_SYSTEM_TRUSTED_KEYRING=y and CONFIG_X509_CERTIFICATE_PARSER=m still results in the following error: LD .tmp_vmlinux.kallsyms1 ld: certs/system_keyring.o: in function `load_system_certificate_list': system_keyring.c:(.init.text+0x8c): undefined reference to `x509_load_certificate_list' make: *** [Makefile:1169: vmlinux] Error 1 Fixes: e90886291c7c ("certs: make system keyring depend on x509 parser") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Tested-by: Adam Borowski <kilobyte@angband.pl>
Diffstat (limited to 'certs')
-rw-r--r--certs/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/certs/Kconfig b/certs/Kconfig
index bf9b511573d7..1f109b070877 100644
--- a/certs/Kconfig
+++ b/certs/Kconfig
@@ -43,7 +43,7 @@ config SYSTEM_TRUSTED_KEYRING
bool "Provide system-wide ring of trusted keys"
depends on KEYS
depends on ASYMMETRIC_KEY_TYPE
- depends on X509_CERTIFICATE_PARSER
+ depends on X509_CERTIFICATE_PARSER = y
help
Provide a system keyring to which trusted keys can be added. Keys in
the keyring are considered to be trusted. Keys may be added at will