From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755863AbbJUTQg (ORCPT ); Wed, 21 Oct 2015 15:16:36 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58691 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755268AbbJUTQe (ORCPT ); Wed, 21 Oct 2015 15:16:34 -0400 From: Arnd Bergmann To: John Johansen , linux-security-module@vger.kernel.org Cc: James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org Subject: [PATCH] apparmor: clarify CRYPTO dependency Date: Wed, 21 Oct 2015 21:16:29 +0200 Message-ID: <5026142.BskI2YQ2fk@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:FT7gEFAXKTjyn5KnJsludX6UQGKqZ7Bs6AQb90L759Kdf1Qzt/7 FcBOOsRUq5X6oZGtSFkNIJXAn7BcSLYc5t1Cf6+E9ZyxptwdgZ7dJssfERygLgFkGkL25ab pAS+0LkTh3odrI7jh7C/G2Y/VcSySUXasbUgMs+VgPZbkO6wDOw9EkaQtBa0+YgONpMdrYS OuNwQI/xwbpHD1GxiBB0w== X-UI-Out-Filterresults: notjunk:1;V01:K0:H62RrOxhkVI=:wF9qFZZEDzVAmtMOSfjEAf R+0ofET2kjAQUmjFGV6dqX7dM5oLk0sZ13kjWSSS49puY7mISijmK0ulxmV68XHdjHB+m9KKL /gQ1RjtLev02qP3+R3BGSm3yHIm/RR50la3tpSlPMiVmr5oLNybYfqCOAOZHKoA+z7mm0jPVM gD6wjWasfIACHmXIlfyhUu0hQAM3YKRUQbutFrUYCdCzkU3aoh8NEg4bmWnWzJZIbZwowvkS8 SsFyk4HfGncCW169qKfu6gC1r4pTgqBsFANtKhOhnl3tp1DAcFIsY/S0J3VVaH5NjcxyFGScD 3rSGEd31JxmuAE2JvDEQuAuISf3U63IBgj387ehO7MZW94vNKPrR2QispTNZg4CQiZupD/izF yYVfTXfsMFx97H5Lq/OulYB1QLJPv3PIcDX1G812xYuRwmmRJFLeO3Yr3DP5i22yS4el0eDoZ wm3JJHIdpuJ8uPVFdvseipCckHl7de/0M3hkKIVdNjA//vwsOxrn0gCKuiIrBPG+rYSGC5N7I qLXGuxZSj/6ES00uQmqF2xyfKlskZduLKnRhvRbgZAS4IT5vfFVqci2b5m8vl2TdvLFON9Leb M63Q2WMm4kzFYo8utqjj55I3aGGrc0QX+p+TPJbgQxZytV5nofdZ32OFp8CveD9Qn79l10TmZ 345PCJLxXYdAVlnTlmT0ZNaYBxG4DeJGmvk9Ajqt9pRCu92uT4/v4nt7Op0HohIJZ6l33QycL 5IC64TLmqy00vK6u Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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