apparmor: clarify CRYPTO dependency
authorArnd Bergmann <arnd@arndb.de>
Wed, 21 Oct 2015 19:16:29 +0000 (21:16 +0200)
committerJames Morris <james.l.morris@oracle.com>
Thu, 22 Oct 2015 00:11:28 +0000 (11:11 +1100)
The crypto framework can be built as a loadable module, but the
apparmor hash code can only be built-in, which then causes a
link error:

security/built-in.o: In function `aa_calc_profile_hash':
integrity_audit.c:(.text+0x21610): undefined reference to `crypto_shash_update'
security/built-in.o: In function `init_profile_hash':
integrity_audit.c:(.init.text+0xb4c): undefined reference to `crypto_alloc_shash'

This changes Apparmor to use 'select CRYPTO' like a lot of other
subsystems do.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
security/apparmor/Kconfig

index d49c539..232469b 100644 (file)
@@ -33,7 +33,7 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
 config SECURITY_APPARMOR_HASH
        bool "SHA1 hash of loaded profiles"
        depends on SECURITY_APPARMOR
-       depends on CRYPTO
+       select CRYPTO
        select CRYPTO_SHA1
        default y