Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754571AbaGKQBY (ORCPT ); Fri, 11 Jul 2014 12:01:24 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:50502 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750834AbaGKQBS (ORCPT ); Fri, 11 Jul 2014 12:01:18 -0400 X-AuditID: cbfec7f5-b7f626d000004b39-1b-53c00a4b41d7 From: Dmitry Kasatkin To: zohar@linux.vnet.ibm.com, dhowells@redhat.com, linux-security-module@vger.kernel.org, linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, dmitry.kasatkin@gmail.com, Dmitry Kasatkin Subject: [PATCH 1/2] asymmetric_keys: make crypto builtin if asymmetric keys selected as builtin Date: Fri, 11 Jul 2014 18:59:44 +0300 Message-id: X-Mailer: git-send-email 1.9.1 In-reply-to: References: In-reply-to: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmluLIzCtJLcpLzFFi42I5/e/4ZV1vrgPBBmsuWVnc+ruX2eJd028W iy9L6yzu3/vJZHF51xw2iw89j9gsPq2YxOzA7rFz1l12jweHNrN4vN93lc2jb8sqRo/Pm+QC WKO4bFJSczLLUov07RK4MjZtXcNSMJ27YvV06wbGuZxdjJwcEgImEh+X7GWDsMUkLtxbD2Rz cQgJLGWUOD3rFhOE08kk0X5zNQtIFZuAnsSG5h/sXYwcHCICFRK37mSBhJkF0iU+TeplB7GF BZIkbpydBVbOIqAq8eX+XDCbVyBO4vvRS0wQy+QkTh6bzApicwpYSbw+1wZWIyRgKXHp+hZG XOITGPkXMDKsYhRNLU0uKE5KzzXSK07MLS7NS9dLzs/dxAgJwK87GJceszrEKMDBqMTDOyN5 f7AQa2JZcWXuIUYJDmYlEd6rb4BCvCmJlVWpRfnxRaU5qcWHGJk4OKUaGB14+D6Jey2cwscm 3Hz/wYS0V6aLwmTeLpogNJ9VVln/64zDhaH5NbsbCwqeG77apr1iybxbQr5PXm88ajQj4lhX sXVc/EMOjS+rItNTf6adMtxgUTkn6ZyNSmq7v/VnuT4tneUFC2NPP5wg0Rr69drntt8qjTOq N5Ue8Pw2P9Vxr+qcQJ65z5RYijMSDbWYi4oTAaVvpJAeAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When ASYMMETRIC_KEYS=y, but depends on CRYPTO=m, selections will be also modules. In random config case OID_REGISTRY, MPILIB and ASN1 became modules producing build break. This patch removes asymmetric keys dependency from CRYPTO, but instead selects CRYPTO and CRYPTO_HASH as they are needed. Signed-off-by: Dmitry Kasatkin --- crypto/Kconfig | 6 +++++- crypto/asymmetric_keys/Kconfig | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index ce4012a..96835d6 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -10,6 +10,11 @@ config XOR_BLOCKS source "crypto/async_tx/Kconfig" # +# asymmetric keys +# +source crypto/asymmetric_keys/Kconfig + +# # Cryptographic API Configuration # menuconfig CRYPTO @@ -1405,6 +1410,5 @@ config CRYPTO_HASH_INFO bool source "drivers/crypto/Kconfig" -source crypto/asymmetric_keys/Kconfig endif # if CRYPTO diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig index 03a6eb9..a38d2d4 100644 --- a/crypto/asymmetric_keys/Kconfig +++ b/crypto/asymmetric_keys/Kconfig @@ -30,6 +30,8 @@ config PUBLIC_KEY_ALGO_RSA config X509_CERTIFICATE_PARSER tristate "X.509 certificate parser" depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE + select CRYPTO + select CRYPTO_HASH select ASN1 select OID_REGISTRY help -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/