From patchwork Tue Dec 8 04:12:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 339688 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3365549jai; Mon, 7 Dec 2020 20:13:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJx87PBmjsL1sjK99Fa0fGCjLg29asfppRf+/aiU1uMJt5yOzmGvDdyGvv2GOrneUKuWnHgx X-Received: by 2002:a17:906:c790:: with SMTP id cw16mr21945131ejb.344.1607400802041; Mon, 07 Dec 2020 20:13:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607400802; cv=none; d=google.com; s=arc-20160816; b=G9rj6Q+cAKJevjn7pEZi7kadJyBZa2QMoIgG+dW2irjJ7tUYczJfsuLl5TBuP5lgI+ Tb+W+T7s2B8+MkYpjKlSRCz9MB0dLCUp2R4jtTOonq9Os+GteqCXi9Xlme82SbWn/con DG1qn6I/QuHbaoNiUFs1CHpsC8TXptOtNjiiIkbLp+YMZTani2LqXd0WIpq1YHlQ9s7m ovcmuQ0kYs9iO5+e8jOwwinKrmaGsG9yjm1MOMOEslRacnYhGhE3hC9HuEBFJPS7lt4T 2tuG5TEPMG6uP5OkN6QET/w48W0+bLSxUWZQ1AcLVHtFmtQrIo7v3Vt321HhdpxhilrU p/LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RSIP2cEbSOdxW3qvNALuAQIEhaBfoUdb6Bv0jnFEOZw=; b=xCBeNOheQSPmY/Bb4TcTyIZVLl2A/4KytGIB+ZToHZjg+PJANVGg8ut8sWHgYJvzk6 du15EA4agh/FA8MdOBdMeCOm51Wdf2csshdKNjDI/a2Sy8EzMgp6Fresw+D56lvWy5M6 ljMT1ayYS2Ckc5I4Jd6xQHmNKJZWATHURMfMJxafP04pnkFGhdpMnYl5bV+qSSO5KI79 gxPGzpflvofNCoESLONYb+jWiW/k8X3kCiUdfFSbOcfPgE2EuJmVvzj+oYnRH6xdvJFt XTAcYaorHaMyJ9FyaKuhjzg6WrsWhuDWaw9dNGwXZvyedJJH7yPXhPwKkGi1XgM12n0P mNqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=hEYNvHgX; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id f15si7375642ejr.2.2020.12.07.20.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 20:13:22 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=hEYNvHgX; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B3D7F82591; Tue, 8 Dec 2020 05:12:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hEYNvHgX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 79A4E825A1; Tue, 8 Dec 2020 05:12:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_SBL_CSS,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (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 DAC4F823ED for ; Tue, 8 Dec 2020 05:12:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=joel.stan@gmail.com Received: by mail-pl1-x644.google.com with SMTP id y8so315109plp.8 for ; Mon, 07 Dec 2020 20:12:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RSIP2cEbSOdxW3qvNALuAQIEhaBfoUdb6Bv0jnFEOZw=; b=hEYNvHgXMEOWt0ut8JdV68ZxEMRt5UtwI+V7TYZxtA146JfLtFPAY2jFdqngdjyWlh 7+awMnQ3Mw+p9hsCIiWx9TTdJ3Tq3e4VnX7NcBV9bXUCvfznQNusBQzR6T2RmUOlWmqo gQ7p2IWue6COtFovq5gfFm9waU23a+U8omWzC//rCEG8Ig7za/RCK+DCQxlSHkUJpiFz 8Cby9lUIWjt4T+hndt9W9MA5wZwuslPFc2R6Np+VT+tnOVQycM+HB1aHTg4UBG8WBfc3 uxmtqc8i+c/zQ9n9WROfnKCuv6FzEkZ+mfPavX/Mwl8OkYjy8wUEvKOewnEIzWfYNqcl 7f9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RSIP2cEbSOdxW3qvNALuAQIEhaBfoUdb6Bv0jnFEOZw=; b=HHgTX/TRSbUjie7MIl+8ObBxqvimLH/QdkwF0kJ23iS+6O9UjTpne+tz69npLgQiSS lcwkH8Y3oXkMU4Qom8Gxlpkw/En+kVtTEFPl5xh3D4OygKo4P1jZ4JNY7qKvhmLdJ61s e9e6wXcNqoN+o4yExStKJwd1LNqKUjoXcnJaQpUH0E6XA9SQF5x0ctbRieVYK6Fj8NlI 6lyMDJZNTWFYcCwdjtDgg2xhHXgC+o6/p3CBC6E/WWkiYcqH+m82tpv6v6wNOd8N8JrF IDjA9kGQUaeV+2k/JommDv4V1Z2L+VB0MvXajvBQFwzCm63NmdmP4GlEoiTowoKrhKPH K39A== X-Gm-Message-State: AOAM533CuQpOGnsvsWuzjs4KbLwDc2ZHscAv0CuCjeDfb1j0/0yr43OL afFkgBG+gjX8yhDrLL5DPjo= X-Received: by 2002:a17:902:bf44:b029:da:d0ee:cef with SMTP id u4-20020a170902bf44b02900dad0ee0cefmr18707373pls.12.1607400763495; Mon, 07 Dec 2020 20:12:43 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id j20sm6055162pfd.106.2020.12.07.20.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 20:12:42 -0800 (PST) From: Joel Stanley To: Simon Glass , Heinrich Schuchardt , Philippe REYNES Cc: u-boot@lists.denx.de Subject: [PATCH v2 4/4] mkimge: Reject signing-related flags without FIT_SIGNATURE Date: Tue, 8 Dec 2020 14:42:16 +1030 Message-Id: <20201208041216.888902-5-joel@jms.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201208041216.888902-1-joel@jms.id.au> References: <20201208041216.888902-1-joel@jms.id.au> MIME-Version: 1.0 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.102.3 at phobos.denx.de X-Virus-Status: Clean When CONFIG_FIT_SIGNATURE=n the signing options are not available. If a user is careful they will notice this when looking at the help output. If they are not careful they will waste several hours wondering why their FIT doesn't contain a /signature node, as mkimage will silently ingore the signing related options. Make it obvious that the commands don't work by removing them from the getopt opt_string. $ mkimage -f machine.its -k keys -K u-boot-pubkey.dtb -r image.fit mkimage: invalid option -- 'k' Error: Invalid option Signed-off-by: Joel Stanley -- v2: Leave padding related options in the CONFIG_FIT_SIGNATURE=y optargs --- tools/mkimage.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.29.2 diff --git a/tools/mkimage.c b/tools/mkimage.c index 68d5206cb4fd..f7d3ac40e681 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -142,7 +142,11 @@ static int add_content(int type, const char *fname) return 0; } +#ifdef CONFIG_FIT_SIGNATURE #define OPT_STRING "a:A:b:B:c:C:d:D:e:Ef:Fk:i:K:ln:N:p:O:rR:qstT:vVx" +#else +#define OPT_STRING "a:A:b:B:C:d:D:e:Ef:i:ln:O:R:qstT:vVx" +#endif static void process_args(int argc, char **argv) { char *ptr; @@ -150,8 +154,7 @@ static void process_args(int argc, char **argv) char *datafile = NULL; int opt; - while ((opt = getopt(argc, argv, - "a:A:b:B:c:C:d:D:e:Ef:Fk:i:K:ln:N:p:O:rR:qstT:vVx")) != -1) { + while ((opt = getopt(argc, argv, OPT_STRING)) != -1) { switch (opt) { case 'a': params.addr = strtoull(optarg, &ptr, 16);