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 B6901C433EF for ; Thu, 4 Nov 2021 02:49:45 +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 29B46611C4 for ; Thu, 4 Nov 2021 02:49:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 29B46611C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.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 D9A4E83664; Thu, 4 Nov 2021 03:49:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Y9k49jJ0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B1F3483641; Thu, 4 Nov 2021 03:49:22 +0100 (CET) Received: from mail-ua1-x933.google.com (mail-ua1-x933.google.com [IPv6:2607:f8b0:4864:20::933]) (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 106BD83641 for ; Thu, 4 Nov 2021 03:49:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@google.com Received: by mail-ua1-x933.google.com with SMTP id b17so8372691uas.0 for ; Wed, 03 Nov 2021 19:49:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=7skvPQ++EWhW/MlfdUcuzRaIuwj3YOmazGBEcxXXxSQ=; b=Y9k49jJ0GxQ9kmkzNcVpS6Eza6MvvxTQiumwL7Oe6brCMYmdGnVeNDI0k69O3Wsk/G R0VVeN80Yn5A6bZ1snZZZFB5PBUHUGjxKhxDHFYh0MliedFeRcqBbpMk5ELYEnMVAgo/ bkaaqlh4R1ote5IZTOqZ7ulacSTDPeULkUVbs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=7skvPQ++EWhW/MlfdUcuzRaIuwj3YOmazGBEcxXXxSQ=; b=ZQ5gIpUaU3sCVkEbLOI+uPjCT3v6An+CO1k8UQeDVv2RnTuaW0EUE2eJ6Ltd47rqRm VO1VEP9JcOghYGWc/0cQI9SctM5AtSrrq/vx2TprJALYmwFtYS2mwKP12mTl+opJ9vUV w+JcvFyjSQisRGq7zE7edyKzujDK81Ta15O/2d44l7jW7JoMwh3NbdhbZJhL61IuaKn2 PniJGdcBDxYG/6NBtXe8kAmheODqBpSAnOow3tNQuirti8BJq9gVeUCWopuICYG5/4cS M8Vc50+VE9IcUXHAk0b2RnU3f96xuaFQlS5INZG1X2j0V2mPyHjoDBUG6Aq8tACpfpq6 UQeA== X-Gm-Message-State: AOAM531IxVuEaFmrco64ddDav9gxn5TKXLCSwMimKN6xHGXmJSFUVY1X PZfKpE/k0+VRtvqmhMhNeaQccvCpR40ax/oZEoqU4A== X-Google-Smtp-Source: ABdhPJwUfbN/xscBPox7VnNQCE0JJHHB7SY+Qj7+9E5B9XP6kXXbRN7STHb3E0RuW6jOXxxEloSJAUnGBa0ukRbWsPw= X-Received: by 2002:a05:6102:21a3:: with SMTP id i3mr36743783vsb.8.1635994155553; Wed, 03 Nov 2021 19:49:15 -0700 (PDT) MIME-Version: 1.0 References: <20211028062356.98224-1-takahiro.akashi@linaro.org> <20211028062356.98224-6-takahiro.akashi@linaro.org> <20211029052539.GC33977@laputa> <20211104020403.GB46422@laputa> In-Reply-To: <20211104020403.GB46422@laputa> From: Simon Glass Date: Wed, 3 Nov 2021 20:49:04 -0600 Message-ID: Subject: Re: [PATCH v5 05/11] test/py: efi_capsule: add image authentication test To: AKASHI Takahiro , Simon Glass , Heinrich Schuchardt , Alex Graf , Ilias Apalodimas , Sughosh Ganu , Masami Hiramatsu , U-Boot Mailing List Content-Type: text/plain; charset="UTF-8" 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 Hi Takahiro, On Wed, 3 Nov 2021 at 20:04, AKASHI Takahiro wrote: > > On Tue, Nov 02, 2021 at 08:58:15AM -0600, Simon Glass wrote: > > Hi Takahiro, > > > > On Thu, 28 Oct 2021 at 23:25, AKASHI Takahiro > > wrote: > > > > > > 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. > > > > I don't mind about the style. > > > > Does the command appear in the test log? > > I don't think so as it is invoked in conftest.py. > If the command fails, the tests will skip, and if it generates > a improper signature, the tests will fail. Well that is what I am getting at. Can you check? The test log is supposed to show everything that happened. It does that with other tests and I worry that using this function to run things will mean that no one will be able to debug your test in CI. Regards, Simon