diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 21:16:29 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-22 11:11:28 +1100 |
| commit | 083c1290ca73666ce1b551cc89d080d060f02ad6 (patch) | |
| tree | c6d808ece1f44e65e137b5bba465c498afc3e611 /security | |
| parent | 09302fd19efbff9569eaad3f78ead8f411defd87 (diff) | |
| download | linux-stable-083c1290ca73666ce1b551cc89d080d060f02ad6.tar.gz linux-stable-083c1290ca73666ce1b551cc89d080d060f02ad6.tar.bz2 linux-stable-083c1290ca73666ce1b551cc89d080d060f02ad6.zip | |
apparmor: clarify CRYPTO dependency
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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig index d49c53960b60..232469baa94f 100644 --- a/security/apparmor/Kconfig +++ b/security/apparmor/Kconfig @@ -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 |