diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-17 14:27:28 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-17 14:27:28 +0200 |
commit | 147c679363dd7e9bd0f8f9ea404c060569e37fee (patch) | |
tree | ce58cbee01b125ed771f111cec4496e03dcdd3f3 /kernel-x86_64.config | |
parent | fd60ab6e3c383df7f6eccd5ae34cc9661ad00255 (diff) | |
parent | 47006d595fd71c38f10e7caba99c882cc0ac1d7a (diff) | |
download | kernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc29.tar.gz kernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc29.tar.xz kernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-x86_64.config')
-rw-r--r-- | kernel-x86_64.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 0aadcd337..44d238b32 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2228,8 +2228,8 @@ CONFIG_IIO_TRIGGER=y CONFIG_IKHEADERS=m # 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 |