From patchwork Tue Mar 12 01:18:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1055007 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="zducc+L1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44JHDc0WVvz9s6w for ; Tue, 12 Mar 2019 12:18:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B49C5C21EF0; Tue, 12 Mar 2019 01:18:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BB7B7C21C2F; Tue, 12 Mar 2019 01:18:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C8C2FC21C2F; Tue, 12 Mar 2019 01:18:50 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by lists.denx.de (Postfix) with ESMTPS id 63869C21BE5 for ; Tue, 12 Mar 2019 01:18:50 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id m35so844442ede.10 for ; Mon, 11 Mar 2019 18:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z5E+2YGtH1atjOR8+VLE3xBEkRUx7ovdYClmtlfn0cI=; b=zducc+L1C3fknGbOHyTfUafcRgp5p7MxB3xmusyasZXCFsWmQMeHjKpUJihcQPWa4q kpp1yTDU98OahJxoWMhxwqJarSD9zmEtRZ+eBubIuQE9V7udlcEl3cyQdOys4bHsf+IO /CwAJb0u7TUyBFuhnttzXiOGtWcQMQwTsCt09SYSSxS0q7M4FKypz+8TwfK5RS5EtFvR RRtZzIwHPfkzwW/Z7zUq395fH0KhLJL413DywK8c9jszaHBQDDg/NqZy5rEGLIYzmK7r WHyEwdQ9BwgIQu1R/VOaUsDKhXjQ5EAHrdg+6YZRAKftQkTv3shkvZgHtk1L1fKvp+hi tipA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z5E+2YGtH1atjOR8+VLE3xBEkRUx7ovdYClmtlfn0cI=; b=snorx8xWPtT+X18HCEijKepu7AzFpmCJ8PuWW7K1WRtUAYytmCVi2JsHVLyZE0GNjn NcqpoKaSLu49IhAYbubbgNgWQcAIT3CF6+I7TBwWX4g8cOAb2+y7bZ4fRAhEWCxWuW+k PWbFvdGwGKFQ5oeNvgqPFk2DRA0gAjFyHYATuh9L6fGN2mlUNLJGXDYZU21Ik096Qz3V 5OivyHlB9FOlGJ+Zhm/dJG0tyzkDiSvTCXSFJZtpsThU/viLpel4PVpE51WV+/ltk0Wa 14Ki9yF2MaFNsJM3Z21g8/e6TBHvPQTFPc0GVrnjXCZqOOaZ99XW/gUVzYnCvg16ZbDG ulgw== X-Gm-Message-State: APjAAAXT498qjZgAQitK/ax1b9L+ZkwETb78vEtnPKnJs72en5PPdh1R 0dV2FZdNtEx8fqUyobs5dA8puwFOwGo= X-Google-Smtp-Source: APXvYqz4bWmLW0Rb+LuRHtaqA1xw9yL50Z8tVXdok6dJkTiP92mgl+iKsjvbIjkQ0Y7Y0AVwwCLIyQ== X-Received: by 2002:a17:906:4819:: with SMTP id w25mr23768685ejq.150.1552353529659; Mon, 11 Mar 2019 18:18:49 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id o23sm3351555ejg.28.2019.03.11.18.18.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 18:18:48 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Tue, 12 Mar 2019 01:18:46 +0000 Message-Id: <20190312011846.6022-1-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [RESEND] [PATCH] cmd: image_info: Add checking of default FIT config X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch adds a check for the default FIT config to iminfo. Once applied any signing of the config will show a pass fail similar to rsa+/rsa-. Output looks like this: Hash(es) for Image 0 (kernel@1): sha1+ Hash(es) for Image 1 (fdt@imx7s-warp.dtb): sha1+ Hash(es) for Image 2 (ramdisk@1): sha1+ Hash(es) for Image 3 (bootscr): sha1+ Hash for default configuration: sha1,rsa2048:mbl-fit-rot-key+ Signed-off-by: Bryan O'Donoghue Cc: Jun Nie Cc: Simon Glass Cc: Tom Rini Reviewed-by: Simon Glass --- cmd/bootm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmd/bootm.c b/cmd/bootm.c index c3a063474a..b3bd236165 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -244,6 +244,9 @@ static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int image_info(ulong addr) { +#if defined(CONFIG_FIT) + int cfg_noffset; +#endif void *hdr = (void *)addr; printf("\n## Checking Image at %08lx ...\n", addr); @@ -294,6 +297,20 @@ static int image_info(ulong addr) return 1; } + cfg_noffset = fit_conf_get_node(hdr, NULL); + if (!cfg_noffset) { + printf("Could not find configuration node: %s\n", + fdt_strerror(cfg_noffset)); + return 1; + } + + puts(" Hash for default configuration: "); + if (fit_config_verify(hdr, cfg_noffset)) { + puts("Unable to verify default fit config\n"); + return 1; + } + puts("\n"); + return 0; #endif default: