Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[firefly-linux-kernel-4.4.55.git] / security / apparmor / Kconfig

diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index 9b9013b2e3211a9c6de17a9001e7939a73bf48e9..d49c53960b60c5010d314022d3e58d255ffac204 100644 (file)
--- a/security/apparmor/Kconfig
+++ b/security/apparmor/Kconfig
@@ -29,3 +29,15 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
          boot.
 
          If you are unsure how to answer this question, answer 1.
+
+config SECURITY_APPARMOR_HASH
+       bool "SHA1 hash of loaded profiles"
+       depends on SECURITY_APPARMOR
+       depends on CRYPTO
+       select CRYPTO_SHA1
+       default y
+
+       help
+         This option selects whether sha1 hashing is done against loaded
+          profiles and exported for inspection to user space via the apparmor
+          filesystem.