From patchwork Sat Aug 28 10:13:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1521857 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=aKhtOcXE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GxXVK5LMDz9t0J for ; Sat, 28 Aug 2021 20:13:43 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 17B638318E; Sat, 28 Aug 2021 12:13:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="aKhtOcXE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4432D831A0; Sat, 28 Aug 2021 12:13:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 337C48317A for ; Sat, 28 Aug 2021 12:13:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630145599; bh=COn+maSqJnrwqVf237LCjhTdiClGgczeo/uLubl36hQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=aKhtOcXEtSwtmc3gXYOv56MT8KQmAgOcpE2arUfOPKY9UAs2o6TgBcbf5uLVwAmB8 BkuvYETfE0c6YBxQA8yaGmUP9K6fzuzOgQbq5pwJsOw55MNTbPpkrMEoIFPWKXQRzu aw+dNSWCrQ3aROCmc7Ar14U6jDHkMgO84BWbz+m8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.144.157]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MxUnp-1nDPb40AZt-00xtuR; Sat, 28 Aug 2021 12:13:19 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: Alexandru Gagniuc , Simon Glass , Donald Chan , Marc Kleine-Budde , Heinrich Schuchardt , =?utf-8?b?VmVzYSBKw6TDpHNrZWw=?= =?utf-8?b?w6RpbmVu?= , u-boot@lists.denx.de Subject: [PATCH 1/1] lib/rsa: don't use NULL as key_id Date: Sat, 28 Aug 2021 12:13:05 +0200 Message-Id: <20210828101305.125966-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:a0t4rmZxr1l2ZVBou/TovBQgjmcKgenx9rnJFgVa51bnxO0FM4G xuWed1Bma0QGRd+p8xXynSvpsWbLu/XuTseFM8M2NIsgxdrPGrFvJno1OHW9OOufIe6bCDH vOnmks4jv+a4gcK5KxeoH6XUl8y7LxQD6W6LVgwjNrs5RyX9GGRO2YLp8oJLapouu8oG/oZ 2H8i/6uBMyY1Y6ny/Ejng== X-UI-Out-Filterresults: notjunk:1;V03:K0:MjLYQmt2fu0=:RCT+IfUA4Ta0zwjfTPUZ+s n9QiAeB4qmVsCIcu/rTDLE7pVm0TLXkXSCK7FI5lrizOrEWwutidnIN66/TT5WScpdGqKVa3s bwuEFGQhS4OVXY7MMMc3ou8dig/GfW9xlPBxdhOXf3mlU7yzTdI8HwFOn86usV802Zelu67tJ Q71bVT8YnvuCrlov5faZgDSiUHuAy5tkVEb2dbW7AJ6d9lTlqD1DnjsPErDIruyQBlKbyx5MF wUNBB2wWjJL9Vx7RokDhoeBV6jMOukm1eq6pF1ZaSfUsuE0oyrSbzrEip7uiNhopUZoy4BZTO eS1pXRQcwiJjeTkoQGQYu5+0Ela4PdniaPl/IWyRz3wUl2Xj3jx/ShCyIi2M95Rkp63iQbOA6 IYqV5slpoCv68It+zAGK3d3n/m//0/tQGEzr39C++RBeAZnceFMShap1P7WO/IuUczGBbBLQO JP9oswd3KU/EPoyx0NMeej7HD1UOiqTdCNa6AHC+NnKm9/RhljIXJfHG/vAuYvn9UNDX6zg/9 tciqSum1/dG9+DqqdIhyATGjevNLLyeOSrqUr7wrq7JVpoqRTi0GVMq+bnbTVi9mcsGxcD2UR oGDNAIgPuFt4XH+k+EdrzNFNoPQj7pnqZjkFc7FKnCRp1lYMTw/QkQFQBJjIg9kMP2K2KOYGm jtQX5UPqJtvh79tCh8zWvP22a+zyqJ21k5Bslc6d6I4RWudYkPnXTNBgdJiPmZPuJZnhigC2e jS8KL3AMe2v0fuwzcWI5ieKixYceBuUPD8nbRbcx/B874tFRtLQjhyOHe50o0f9VoeaT7mcWW A5aFxz0lwfQjLFN9ulDazLzxMvoWehxWY/6NPhOXO4q6QCNxKcoecjqojHteZCKeNeerpglun pUs3ATzSfxtn31SAjd92SqSCDbHqQXN7gbHcCAetq9LQ5gYNY0un1M7bzycTVI6+hwJrhoCj/ /EBj07AY3AX5z7w3GqgruRG+2CXcWevQ9MMGYdQKlxpj1HfPz8uU1d53KwNufvwbkJdx3PSfc EX1RtHElEvVRYMGOT01I94zwOAe80m92YI9nn9L5tgz0tGjsDv0GIgayRLsFisC01X5kvZaZz Imu7hznNuypnykIeTO0kygozt0E/1wUEAn8/JYIvzAYH3S/anSj8S7IDg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean If keydir is not provided but name is we want to use name as key_id. But with the current coding name is only used on its own if it is NULL and keydir is provided which never occurs. Fixes: 824ee745fbca ("lib/rsa: Use the 'keyfile' argument from mkimage") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- lib/rsa/rsa-sign.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index 085dc89bf7..0e0a890fd1 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -269,7 +269,7 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name, snprintf(key_id, sizeof(key_id), "%s%s", keydir, name); - else if (keydir) + else if (name) snprintf(key_id, sizeof(key_id), "%s", name);