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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 41869C433F5 for ; Mon, 14 Feb 2022 06:56:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 98E4083874; Mon, 14 Feb 2022 07:56:20 +0100 (CET) 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="KWVeuFBz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23FEA83879; Mon, 14 Feb 2022 07:56:19 +0100 (CET) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (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 7E25F834D2 for ; Mon, 14 Feb 2022 07:56:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x52f.google.com with SMTP id b14so1040310ede.9 for ; Sun, 13 Feb 2022 22:56:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=sQkBoLbtgZn5bax5IYl9IG0XtzkwWJLRVr1e3xRvkf0=; b=KWVeuFBzgvUu7qFZkL6RmwXe+DzWmI7JZ8YmICaRKLueawulOf+n/tx/VidtMbvVGn QQbmC7wPnFm3zanoG4G22pBLRbnJXQQclDRdbmQ9UF0IQsvTKKyoHfzPIz3pAnTrZTBE avWJ7Xznob+f3ztJXWHP/SPuNjgL/wITFx7297YClfDVAlw4BzhxBbb+L2sESgVRHOak 24j3LwALSR4aVA0awP7FfSImU0O6fXC1AG1v9ailnS2LD5tK5MnBtpNIwwhQe0N9m1T0 5jiN3o8MyQ3Crd/6yNGksGUxt0C5h9rkaXXNmmJjKWRrtRkj5N/giUxxSqWCgf5xtmNO XkOQ== 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:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=sQkBoLbtgZn5bax5IYl9IG0XtzkwWJLRVr1e3xRvkf0=; b=3dLJbfnneyHSNKTMai5AhsAF2DY6ZLKfyfOtmohV7rN7aqFpT/gen4UL0CegGO6Mtd MtXFYEQUkpV6QzHjVTUSHnHxhRXrdpzqCbG7iS2uINEuFFO/7EpQMa0P4YPUHoYMo9jU OEEPSy9oFuhGo4Bq7dD8uqt3au3XmwTSZlIYStJb7o4zhY01jiX1XpPyuel+v2gpmaWk d1maEQBcBXGTBYTAR8majSwBgKdONvs2XvdoZ1ULJXFBo4Syu9hQtb9VtnRDAg4VC/Da kcKbZl5zdOXdH2pRJTa/zDxnM1mwmVv4jKXw/mcd1KRuffXvx+LWjnEPxDoqtQ41Z7LN LAOQ== X-Gm-Message-State: AOAM533jtaH6+7izJJA2Mrgd8EuWC112Cqrlhng1MPyHuAc/Ixe4EVUz ELyb8luAtvlLbgj1XQE1DAauEk8Si+MH0A== X-Google-Smtp-Source: ABdhPJzaiRv75Cu8ucwwnXj9DHLZyGkMNOVzEIhdfrN+Vh5GEgLc2BpFoefqh4axG5FHROhphtBCuQ== X-Received: by 2002:a05:6402:219:: with SMTP id t25mr13948329edv.62.1644821770029; Sun, 13 Feb 2022 22:56:10 -0800 (PST) Received: from hades (athedsl-4461669.home.otenet.gr. [94.71.4.85]) by smtp.gmail.com with ESMTPSA id 12sm1822586ejg.31.2022.02.13.22.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 22:56:09 -0800 (PST) Date: Mon, 14 Feb 2022 08:56:07 +0200 From: Ilias Apalodimas To: AKASHI Takahiro , xypron.glpk@gmx.de, u-boot@lists.denx.de Subject: Re: [PATCH 2/2] test/py: efi_secboot: adjust secure boot tests to code changes Message-ID: References: <20220211073750.733348-1-ilias.apalodimas@linaro.org> <20220211073750.733348-2-ilias.apalodimas@linaro.org> <20220214015008.GD39639@laputa> <20220214063606.GH39639@laputa> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220214063606.GH39639@laputa> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean On Mon, Feb 14, 2022 at 03:36:06PM +0900, AKASHI Takahiro wrote: > On Mon, Feb 14, 2022 at 08:18:03AM +0200, Ilias Apalodimas wrote: > > On Mon, Feb 14, 2022 at 10:50:08AM +0900, AKASHI Takahiro wrote: > > > Ilias, > > > > > > On Fri, Feb 11, 2022 at 09:37:50AM +0200, Ilias Apalodimas wrote: > > > > The previous patch is changing U-Boot's behavior wrt certificate based > > > > binary authentication. Specifically an image who's digest of a > > > > certificate is found in dbx is now rejected. Fix the test accordingly > > > > and add another one testing signatures in reverse order > > > > > > > > Signed-off-by: Ilias Apalodimas > > > > --- > > > > changes since RFC: > > > > - Added another test cases checking signature hashes in reverse order > > > > test/py/tests/test_efi_secboot/test_signed.py | 30 +++++++++++++++++-- > > > > 1 file changed, 28 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/test/py/tests/test_efi_secboot/test_signed.py b/test/py/tests/test_efi_secboot/test_signed.py > > > > index 0aee34479f55..cc9396a11d48 100644 > > > > --- a/test/py/tests/test_efi_secboot/test_signed.py > > > > +++ b/test/py/tests/test_efi_secboot/test_signed.py > > > > @@ -186,7 +186,7 @@ class TestEfiSignedImage(object): > > > > assert 'Hello, world!' in ''.join(output) > > > > > > > > with u_boot_console.log.section('Test Case 5c'): > > > > - # Test Case 5c, not rejected if one of signatures (digest of > > > > + # Test Case 5c, rejected if one of signatures (digest of > > > > # certificate) is revoked > > > > output = u_boot_console.run_command_list([ > > > > 'fatload host 0:1 4000000 dbx_hash.auth', > > > > @@ -195,7 +195,8 @@ class TestEfiSignedImage(object): > > > > output = u_boot_console.run_command_list([ > > > > 'efidebug boot next 1', > > > > 'efidebug test bootmgr']) > > > > - assert 'Hello, world!' in ''.join(output) > > > > + assert '\'HELLO\' failed' in ''.join(output) > > > > + assert 'efi_start_image() returned: 26' in ''.join(output) > > > > > > > > with u_boot_console.log.section('Test Case 5d'): > > > > # Test Case 5d, rejected if both of signatures are revoked > > > > @@ -209,6 +210,31 @@ class TestEfiSignedImage(object): > > > > assert '\'HELLO\' failed' in ''.join(output) > > > > assert 'efi_start_image() returned: 26' in ''.join(output) > > > > > > > > + # Try rejection in reverse order. > > > > > > "Reverse order" of what? > > > > Of the test right above > > Please specify the signature database, I guess "dbx"? > > > > > > > > + u_boot_console.restart_uboot() > > > > > > I don't think we need 'restart' here. > > > I added it in each test function (not test case), IIRC, because we didn't > > > have file-based non-volatile variables at that time. > > > > You do. dbx already holds dbx_hash.auth and dbx1_hash.auth (in that order) at > > that point. The point is cleaning up dbx and testing against dbx1_hash. > > Why not simply overwrite "dbx" variable? > Without "-a", "env set -e" does it if it is properly signed with KEK. > I am not sure you've understood the bug yet. If I did that, db's 1sts entry would still be there. The whole point is insert dbx1_hash first. The easiest way to do this is on an empty database, instead of starting overwriting and cleaning variables. Why is rebooting even a problem? > > > > > > > + with u_boot_console.log.section('Test Case 5e'): > > > > + # Test Case 5e, authenticated even if only one of signatures > > > > + # is verified. Same as before but reject dbx_hash1.auth only > > > > > > Please specify what test case "before" means. > > > > The test that run right before that > > Please add a particular test case number to avoid any ambiguity. > I believe that a test case description should be easy enough to understand > and convey no ambiguity especially if there is some subtle difference > between cases. This is exactly the test case right above with dbx1_auth inserted first. I think it's fine under the current test. > > > > > > > > + output = u_boot_console.run_command_list([ > > > > + 'host bind 0 %s' % disk_img, > > > > + 'fatload host 0:1 4000000 db.auth', > > > > + 'setenv -e -nv -bs -rt -at -i 4000000:$filesize db', > > > > + 'fatload host 0:1 4000000 KEK.auth', > > > > + 'setenv -e -nv -bs -rt -at -i 4000000:$filesize KEK', > > > > + 'fatload host 0:1 4000000 PK.auth', > > > > + 'setenv -e -nv -bs -rt -at -i 4000000:$filesize PK', > > > > + 'fatload host 0:1 4000000 db1.auth', > > > > + 'setenv -e -nv -bs -rt -at -a -i 4000000:$filesize db', > > > > + 'fatload host 0:1 4000000 dbx_hash1.auth', > > > > + 'setenv -e -nv -bs -rt -at -i 4000000:$filesize dbx']) > > > > > > Now "db" has db.auth and db1.auth in this order and > > > 'dbx" has dbx_hash1.auth. > > > Is this what you intend to test? > > > > Yes. The patchset solved 2 bugs. One was not rejecting the image when a > > single dbx entry was found. The second was that depending on the order the > > image was signed and the keys inserted into dbx, the code could reject or > > accept the image. > > Which part of "dbx" (or "db"?) is in a reverse order? the first tests add dbx_hash -> dbx1_hash, while the second purges the dbx database and adds dbx1_hash to test against. Regards /Ilias > > -Takahiro Akashi > > > > > > > > -Takahiro Akashi > > > > > > > + assert 'Failed to set EFI variable' not in ''.join(output) > > > > + output = u_boot_console.run_command_list([ > > > > + 'efidebug boot add -b 1 HELLO host 0:1 /helloworld.efi.signed_2sigs -s ""', > > > > + 'efidebug boot next 1', > > > > + 'efidebug test bootmgr']) > > > > + assert '\'HELLO\' failed' in ''.join(output) > > > > + assert 'efi_start_image() returned: 26' in ''.join(output) > > > > + > > > > def test_efi_signed_image_auth6(self, u_boot_console, efi_boot_env): > > > > """ > > > > Test Case 6 - using digest of signed image in database > > > > -- > > > > 2.32.0 > > > > > > > > Regards > > /Ilias