From patchwork Tue Dec 8 04:12:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 339684 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3365221jai; Mon, 7 Dec 2020 20:12:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLwhqzW9A56Asc7HgoQyfxBpBYWjFog6S7FjSUVc0nmXVkopA9KT2kikRbKWfjCfR2ukar X-Received: by 2002:a05:6402:1646:: with SMTP id s6mr22959638edx.319.1607400755925; Mon, 07 Dec 2020 20:12:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607400755; cv=none; d=google.com; s=arc-20160816; b=RJjYgmO2LoAFZr7jCbiBiPBpi4JUvrGRdFLwAJeF9ymElIIg8At1mVgRu/U2CblkHv Jbrx69o8yuGmVtHNas4iUxy9H3QByJ/8QyVGVnqL3kCuH8oSpGIc95kdjJwaH6j16hxn eX1KzLHVs2yuCKvA3pF6Fhvvd+XaR1RXMLqjRNcHAHEq0jkbld+RUqTZDFUy3aR8VmQ4 rMPR7+2dxA5Jab5OB/CBxsyS+HulBHJNe7MHHcwAgcYUJBcLUfU/3tx6KZyzdh4BKXW9 7uxtTneTfVgyRgH5Yx5ELzmPBZZmqcCg+lsk4lOJtCNLtmKyXr7FsU6SzTqU4qJaMGE5 urXg== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=obyONFQY0QTvU8pELLqhM9TjZZkOwJ+5SLd8mhDflOI=; b=W3VX4L621DXN8heWhpUSmLmNBncCpXexS+4/+ta4TMd8EcKcFOgbczHe3rQPsB4Z1u aBDTHfGD1yVkyJFweUCJ/UFATbZRvmzHwZGn98C6feUO7BsU5+ZFTT8M1JaMH3MMAZK/ k0avdVxU/zptmboGhhHh2yOTkRcidWvg6kPaYUFlBcGwCVzNMFXeKE2kqZ3Qz9xExtz7 4Dhi2JBUoktI97R4xKmdWlqj+AOThmOAlaiGGIz9nK4JubeAo5tU8N0p3WGOmcUT1/0K RL4YJtzJA5c1mm5+dghDZiOvHchPK9D0ApSkjJtFe+HqXajpV2WbbPM5WSipPLbuYEu7 U6zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=cK40qiUL; 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 u11si9523581edr.4.2020.12.07.20.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 20:12:35 -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=cK40qiUL; 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 40AE5808F1; Tue, 8 Dec 2020 05:12:34 +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="cK40qiUL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 90A54808F1; Tue, 8 Dec 2020 05:12:32 +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-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) (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 4B751806C5 for ; Tue, 8 Dec 2020 05:12:29 +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-x643.google.com with SMTP id s2so6298913plr.9 for ; Mon, 07 Dec 2020 20:12:29 -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:mime-version :content-transfer-encoding; bh=obyONFQY0QTvU8pELLqhM9TjZZkOwJ+5SLd8mhDflOI=; b=cK40qiULC3hyojH4DgJUINZdb1XgI5Fm3IoOSroYPsUlXJkRN6yvHBReKP2VzDnbY9 Wa4dJxD+QKb9ciS2Vv6DCejFID8k3ylbjNV3rFVmPTEZjeLqZ5eObynJ/NPBXr+OEhjz zH+2ZJ3+UZBEkZnhk55LLlVrSQhr/PSQMDnUrRs0PimgyDUnYWax8igHvUgY9q4uO53J q25ffXFSqcGkgZDLA0fQqMQdoPsjrTpS42HzVteWbpQfrnLSKcZb6Nof3yriMdlzXKMO q4Pf85FoeqQGJlaP/AAD6+VZItsRFcHQ5EYPiLFLXXFNgkyCCUdTm6B5Yp85JqeRDEQa mlHA== 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 :mime-version:content-transfer-encoding; bh=obyONFQY0QTvU8pELLqhM9TjZZkOwJ+5SLd8mhDflOI=; b=XtXDlOd5UyLUiFBEsds5cf86GbiCSaff5flBJsFkMIgeHQVI8xy78R9D6gQsY2yPjl aKUQgevX94dGjOQBwIkfyzU9biu4srhKK7bdL3j02vy3UhZG9oNAZaD97L9cHSHsfDg2 dirWSMcL6PuPqsdXZ/Xn+kNdyMvFqkFtDz+yy2ZMfmBJDIlCvRQGL1hhQA8blFpIuGcA 663qdwfRVaa/KhcFmT8HCXj30v8Ahl43U3NMtf/hNuttldVJW6bq6KNT45sYF0toOg0D O6JvYV1eNwr71v0XW2nQIMdxAjL9MO5cSvnDl5UuEOYRjvIZsYEwMISnT5ljHXdRLXcN eXxw== X-Gm-Message-State: AOAM533iB3SIVqiJ5UX9sDmUyG6EZU9UwkjRIs4cdy7l6Pz0cVeSmEYS pjx1eWyPYgsnO0VPVz4Akyk= X-Received: by 2002:a17:902:59d0:b029:da:69a8:11a8 with SMTP id d16-20020a17090259d0b02900da69a811a8mr19994651plj.63.1607400747649; Mon, 07 Dec 2020 20:12:27 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id j20sm6055162pfd.106.2020.12.07.20.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 20:12:25 -0800 (PST) From: Joel Stanley To: Simon Glass , Heinrich Schuchardt , Philippe REYNES Cc: u-boot@lists.denx.de Subject: [PATCH v2 0/4] mkimage usability fixes Date: Tue, 8 Dec 2020 14:42:12 +1030 Message-Id: <20201208041216.888902-1-joel@jms.id.au> X-Mailer: git-send-email 2.29.2 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 v2: Move -B and -E out from FIT_SIGNATURE check, and other fixes from Philippe's review. Original cover letter: I was learning about signed FIT today and was unable to convince mkimage to produce a signature node in my control device tree. It turns out that Debian's packaged mkimage doesn't enable FIT_SIGNATURE, so the options I was passing were silently ignored. There's an existing Debian bug for that[1] but in the mean time this changes mkimage's behaviour to fail loudly when FIT_SIGNATURE is disabled. The first two patches fix some issues I found when testing the third patch under sandbox_defconfig with FIT_SIGNATURE=n. [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972513 Joel Stanley (4): tools/Makefile: FIT_CIPHER requires libssl image-fit: Fix FIT_CIPHER linking mkimage: Move padding commands outside of FIT_SIGNATURE mkimge: Reject signing-related flags without FIT_SIGNATURE common/image-fit-sig.c | 14 -------------- common/image-fit.c | 15 +++++++++++++++ tools/Makefile | 2 +- tools/mkimage.c | 18 +++++++++++------- 4 files changed, 27 insertions(+), 22 deletions(-) -- 2.29.2