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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F652C433F5 for ; Fri, 29 Oct 2021 05:25:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 89DEE6108F for ; Fri, 29 Oct 2021 05:25:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 89DEE6108F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4C3A83564; Fri, 29 Oct 2021 07:25:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="oOB/1552"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D13B0835A6; Fri, 29 Oct 2021 07:25:49 +0200 (CEST) Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) (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 12CCC83480 for ; Fri, 29 Oct 2021 07:25:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pg1-x529.google.com with SMTP id t7so8792954pgl.9 for ; Thu, 28 Oct 2021 22:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=eznWSzQp6YoI9uOGMFNDFDpyfohw82i7dh2IiwR8STY=; b=oOB/1552iXGgh2heWLqAJWa7rpaBNVd6yrQR6G8K8EA6w5EU1eTGbujcOQCmw5uf6r oNi4Bqs564OXW+BJhCgX0GYHEbJNbE7Q1X1l5JcAiEUXUhmPTAbCWnKwNEiJPf1f+7TX YHuLNsjnv53YJMsY+Wzca0mDWppd6SjWArMicvdHxmMpi+4Sp0YDpJNs7MaEE1T2XuE+ CSoRebJk/TLHgaXFOFzDFW5srg1XSuAAinspt8MGibe/AIZdnbPpKnQmYFQ0b0hpBwET BiMJEvz67jGaRn8UVw/TGMYTex5dWfW1ouncuI6dII5P/SGEBMDbGd4k/57T4E6GjtfM SHEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=eznWSzQp6YoI9uOGMFNDFDpyfohw82i7dh2IiwR8STY=; b=i1yaFeiG9rLtV9vOE/kmRSQudWTj9U2kTLKRH/PoFCj0Z/Lhg/2Eez+m9w2e1d5kbK UPvtJ1Cypshez+eJHs/SGWeu+N+CqO5BicVs1eRwUt7lGkfI6clpMPc1Wayx/TtXEUpm cH8kHg8gX5JRTRUGutHzFUoiMIMp1Sor2EowpmXRJUFe3GvvFTMahEE8l9WuUalvECm7 PAvApvrmhNSauw+3y0PiHNJE3MzPLYE1dOPiAYz7AQNyEt87ZlBvx53dTUHRmf/pZIbf Yx5I3elc43WiPN1IbG0+XeI93rm+0AqT80pmSdnNwMPfbC02QlWpQkivehd27et2lB++ THFA== X-Gm-Message-State: AOAM53181eHHcZm4KJGRl2mxsSzJrzrrDkZin6eTlIb7JWqlWuW3hIzN ZvyKN3wp93r7xOqRNb86PI0eyw== X-Google-Smtp-Source: ABdhPJzMRbycIWfwXS2BgE87b0/Bg8bfudlBWQGdKJg5AjPzFcRlDvEOO4blQai+Iy8vnkg6kUeKRg== X-Received: by 2002:aa7:9047:0:b0:44b:e142:8b0d with SMTP id n7-20020aa79047000000b0044be1428b0dmr8729809pfo.45.1635485144433; Thu, 28 Oct 2021 22:25:44 -0700 (PDT) Received: from laputa ([2400:4050:c3e1:100:99fd:f5c5:d3a8:a6cf]) by smtp.gmail.com with ESMTPSA id f13sm99750pfe.218.2021.10.28.22.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 22:25:43 -0700 (PDT) Date: Fri, 29 Oct 2021 14:25:39 +0900 From: AKASHI Takahiro To: Simon Glass Cc: Heinrich Schuchardt , Alex Graf , Ilias Apalodimas , Sughosh Ganu , Masami Hiramatsu , u-boot@lists.denx.de Subject: Re: [PATCH v5 05/11] test/py: efi_capsule: add image authentication test Message-ID: <20211029052539.GC33977@laputa> Mail-Followup-To: AKASHI Takahiro , Simon Glass , Heinrich Schuchardt , Alex Graf , Ilias Apalodimas , Sughosh Ganu , Masami Hiramatsu , u-boot@lists.denx.de References: <20211028062356.98224-1-takahiro.akashi@linaro.org> <20211028062356.98224-6-takahiro.akashi@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 On Thu, Oct 28, 2021 at 09:17:49PM -0600, Simon Glass wrote: > Hi Takahiro, > > On Thu, 28 Oct 2021 at 00:25, AKASHI Takahiro > wrote: > > > > Add a couple of test cases against capsule image authentication > > for capsule-on-disk, where only a signed capsule file with the verified > > signature will be applied to the system. > > > > Due to the difficulty of embedding a public key (esl file) in U-Boot > > binary during pytest setup time, all the keys/certificates are pre-created. > > > > Signed-off-by: AKASHI Takahiro > > --- > > .../py/tests/test_efi_capsule/capsule_defs.py | 5 + > > test/py/tests/test_efi_capsule/conftest.py | 35 ++- > > test/py/tests/test_efi_capsule/signature.dts | 10 + > > .../test_capsule_firmware_signed.py | 233 ++++++++++++++++++ > > 4 files changed, 280 insertions(+), 3 deletions(-) > > create mode 100644 test/py/tests/test_efi_capsule/signature.dts > > create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware_signed.py > > > > diff --git a/test/py/tests/test_efi_capsule/capsule_defs.py b/test/py/tests/test_efi_capsule/capsule_defs.py > > index 4fd6353c2040..aa9bf5eee3aa 100644 > > --- a/test/py/tests/test_efi_capsule/capsule_defs.py > > +++ b/test/py/tests/test_efi_capsule/capsule_defs.py > > @@ -3,3 +3,8 @@ > > # Directories > > CAPSULE_DATA_DIR = '/EFI/CapsuleTestData' > > CAPSULE_INSTALL_DIR = '/EFI/UpdateCapsule' > > + > > +# v1.5.1 or earlier of efitools has a bug in sha256 calculation, and > > +# you need build a newer version on your own. > > +# The path must terminate with '/'. > > +EFITOOLS_PATH = '' > > diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py > > index 6ad5608cd71c..b0e84dec4931 100644 > > --- a/test/py/tests/test_efi_capsule/conftest.py > > +++ b/test/py/tests/test_efi_capsule/conftest.py > > @@ -10,13 +10,13 @@ import pytest > > from capsule_defs import * > > > > # > > -# Fixture for UEFI secure boot test > > +# Fixture for UEFI capsule test > > # > > > > - > > @pytest.fixture(scope='session') > > def efi_capsule_data(request, u_boot_config): > > - """Set up a file system to be used in UEFI capsule test. > > + """Set up a file system to be used in UEFI capsule and > > + authentication test. > > > > Args: > > request: Pytest request object. > > @@ -40,6 +40,26 @@ def efi_capsule_data(request, u_boot_config): > > check_call('mkdir -p %s' % data_dir, shell=True) > > check_call('mkdir -p %s' % install_dir, shell=True) > > > > + capsule_auth_enabled = u_boot_config.buildconfig.get( > > + 'config_efi_capsule_authenticate') > > + if capsule_auth_enabled: > > + # Create private key (SIGNER.key) and certificate (SIGNER.crt) > > + check_call('cd %s; openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=TEST_SIGNER/ -keyout SIGNER.key -out SIGNER.crt -nodes -days 365' > > + % data_dir, shell=True) > > run_and_log()? I have always used this style of coding in this file as well as other my pytests in test/py/tests (filesystem and secure boot). So, at least in this patch, I don't want to have mixed styles. > Can you split up the args or something to reduce the line length? I will try to fix them if possible. -Takahiro Akashi > > + check_call('cd %s; %scert-to-efi-sig-list SIGNER.crt SIGNER.esl' > > + % (data_dir, EFITOOLS_PATH), shell=True) > > + > [..] > > Regards, > Simon