diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-21 19:23:12 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-21 19:23:12 +0200 |
| commit | d78acd272050c215695799bf9242e91c382e5281 (patch) | |
| tree | 60a894f48b076e6e1a777ad47e187d6c2fde20b4 /kernel-i686-debug.config | |
| parent | 4e4971edcd1f4c914591f46de9a3cf1c682d4361 (diff) | |
| parent | 3d5a0b43e81f1ec5e6e2be3d777406d170935e79 (diff) | |
| download | kernel-d78acd272050c215695799bf9242e91c382e5281.tar.gz kernel-d78acd272050c215695799bf9242e91c382e5281.tar.xz kernel-d78acd272050c215695799bf9242e91c382e5281.zip | |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-i686-debug.config')
| -rw-r--r-- | kernel-i686-debug.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index f89797c5d..2ce656236 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2148,8 +2148,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set # CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_ARCH_POLICY is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 |