diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-16 18:29:12 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-16 18:29:12 +0200 |
commit | deb9ee0fa5386974c5835d6a139aa5c386fb2018 (patch) | |
tree | a71465ec29da10d868b548fa62cbe4fe8ad6a870 /kernel-aarch64-fedora.config | |
parent | 437be5ae477df4db34ddac0503f5dc4d1bc51650 (diff) | |
parent | f770443a3c7d11acb1b7e800a6b2eccf0ac8b4ab (diff) | |
download | kernel-deb9ee0fa5386974c5835d6a139aa5c386fb2018.tar.gz kernel-deb9ee0fa5386974c5835d6a139aa5c386fb2018.tar.xz kernel-deb9ee0fa5386974c5835d6a139aa5c386fb2018.zip |
merge originkernel-5.18.0-0.rc7.54.vanilla.1.fc37kernel-5.18.0-0.rc7.54.vanilla.1.fc36kernel-5.18.0-0.rc7.54.vanilla.1.fc35kernel-5.18.0-0.rc7.54.vanilla.1.fc34
Diffstat (limited to 'kernel-aarch64-fedora.config')
-rw-r--r-- | kernel-aarch64-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d3fdf8f2b..b401027c3 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2878,7 +2878,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y -CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y +# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -3029,6 +3029,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y +CONFIG_INTEGRITY_MACHINE_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y |