From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE933C4332F for ; Sun, 4 Dec 2022 22:37:16 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36FCB850AF; Sun, 4 Dec 2022 23:37:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="ji9BCtPr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7A41849CD; Sun, 4 Dec 2022 23:37:12 +0100 (CET) Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 93693856BE for ; Sun, 4 Dec 2022 23:37:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-ej1-x631.google.com with SMTP id vv4so23718393ejc.2 for ; Sun, 04 Dec 2022 14:37:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X5XAz2uEY8bkmUr220B18Vxh30jCkE2rOATN8wF+2cM=; b=ji9BCtPr25FN+rg9EeC5HmItjh6NASHIvJAXtP57L09eTNVTZtYE5rt3E5Rs2hPlQ5 Q5W6RA674kKo2cugUPvNr5KyXICvVJuznpTw3n4KmhcR1PI96qkPBJ36GuznXcTnpZ8l siSh+0NIy4CQjq6hCt3LAxRnth+22v0O6KUAo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X5XAz2uEY8bkmUr220B18Vxh30jCkE2rOATN8wF+2cM=; b=dI2WV5yL+urF3TTaVum1sTpWqjmp1udPancilxDutn1XSMU0I6XlJ2zKh9YEDp/ljy ZH6DWP4WprudOi7FJuUlcOlhL8UJQOIYBeR2lcamzWfEtbvNQ18vH90iczUMpJVqDQ6c RmsQTta7yU6FXMxoT/rurhwzXFYGik+mm6PkcxfoNFasXl2hEnl3bkHiI7OTI95eusx0 0vo993d+lzn8hNoj2KC/LKG4eFoLPCqj9WIeJn9QgIiKvuiHvo+xK360a/DmM/NotCuo ULk0e5EI21qJJ3Kl6nMqOs4TL/pLq91oh9Xn8SeB/0eWgF7dCu3cl08FzwQAToFA0L/2 lcUQ== X-Gm-Message-State: ANoB5pnTduXpzEVB5ivZuIrHLJpyZEDKTrQZZLxzcpYNA8x4ekvw68xA urxIz9d7weoTJQtUpbFaL1dTjM4OuXocX9ua X-Google-Smtp-Source: AA0mqf7w8bQDOCQY0YJtsyaNYwA0EB6kaH7xTDDDVyVtbiecPEW1lwc31Q2AWqj0jzBnymzhDkyisA== X-Received: by 2002:a17:907:d60b:b0:7bc:dbd8:184b with SMTP id wd11-20020a170907d60b00b007bcdbd8184bmr37444704ejc.110.1670193429922; Sun, 04 Dec 2022 14:37:09 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id x11-20020aa7d6cb000000b0045b4b67156fsm4456516edr.45.2022.12.04.14.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 14:37:09 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCHv2 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY Date: Sun, 4 Dec 2022 17:37:06 -0500 Message-Id: <20221204223706.176996-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-10-trini@konsulko.com> References: <20221204150554.4165941-10-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we cannot undef the symbol in this manner. As this ends up being a test within another function we can use !tools_build() as a test here. Cc: Simon Glass Signed-off-by: Tom Rini --- Changes in v2: - Switch to !tools_build() per Simon --- lib/rsa/rsa-verify.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index 9605c376390a..db2aca5385a9 100644 --- a/lib/rsa/rsa-verify.c +++ b/lib/rsa/rsa-verify.c @@ -23,18 +23,13 @@ #include #include -#ifndef __UBOOT__ /* * NOTE: * Since host tools, like mkimage, make use of openssl library for * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are * of no use and should not be compiled in. - * So just turn off CONFIG_RSA_VERIFY_WITH_PKEY. */ -#undef CONFIG_RSA_VERIFY_WITH_PKEY -#endif - /* Default public exponent for backward compatibility */ #define RSA_DEFAULT_PUBEXP 65537 @@ -506,7 +501,8 @@ int rsa_verify_hash(struct image_sign_info *info, { int ret = -EACCES; - if (CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) && !info->fdt_blob) { + if (!tools_build() && CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) && + !info->fdt_blob) { /* don't rely on fdt properties */ ret = rsa_verify_with_pkey(info, hash, sig, sig_len); if (ret) -- 2.25.1