From nobody Thu May 16 06:11:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+75901+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75901+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1622553181; cv=none; d=zohomail.com; s=zohoarc; b=Nk99Jt3LICwot6EAarAn2DUenWNj+27KjjfbPHFpCVrBDNHn9UglTuJH6xr1MUO6Usj2NofdNP1bPbnC1WrJaEVbIOta8xHooZnCuJ6WSMgTU+aIYoG1dbwzDngdmI0sq+3Qkrny9w7R3yyRUqebJZFp5YZ3K+eg+cScimGo24c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622553181; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=jKYSDOnJX4lUhy3cz9kfxhfXt2MVotnqfvk/PkTuSuI=; b=JYX3GDVC+HvXX2peoFhlqmyiIsjcAUQP20CugVIKnEkLFg8hoogc+yH0UIidgaZxyTrZ+mUKE28yYDHzLy7b8/oYqIpJ6BlADWFeYGX7mZdOE+RfR9vRRdrJrT5Io4hb4LXh/3IAYWgBGYXcYNXGp5P/B4hD97XHLRoTOQOa9DE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75901+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1622553181723696.6452493150564; Tue, 1 Jun 2021 06:13:01 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AUZxYY1788612xRHYNA8sIIg; Tue, 01 Jun 2021 06:13:01 -0700 X-Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by mx.groups.io with SMTP id smtpd.web09.57766.1622553175275366063 for ; Tue, 01 Jun 2021 06:12:55 -0700 X-Received: by mail-lj1-f179.google.com with SMTP id e2so19161947ljk.4 for ; Tue, 01 Jun 2021 06:12:55 -0700 (PDT) X-Gm-Message-State: YGWT9xlMVk5oKIXweBQPpUClx1787277AA= X-Google-Smtp-Source: ABdhPJw87p7d/5cFE1B/b792KajhEJd3BBIBTmuvGmdkf0aV+Cw4xNOTBnvfYtrD+0QdopGWPaK02g== X-Received: by 2002:a2e:740f:: with SMTP id p15mr11086377ljc.122.1622553173047; Tue, 01 Jun 2021 06:12:53 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id y5sm1681460lfa.148.2021.06.01.06.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 06:12:52 -0700 (PDT) From: "Grzegorz Bernacki" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, Samer.El-Haj-Mahmoud@arm.com, sunny.Wang@arm.com, mw@semihalf.com, upstream@semihalf.com, jiewen.yao@intel.com, jian.j.wang@intel.com, min.m.xu@intel.com, lersek@redhat.com, Grzegorz Bernacki Subject: [edk2-devel] [edk2-platforms PATCH v2] Platform/RaspberryPi: Enable default Secure Boot variables initialization Date: Tue, 1 Jun 2021 15:12:23 +0200 Message-Id: <20210601131229.630611-2-gjb@semihalf.com> In-Reply-To: <20210601131229.630611-1-gjb@semihalf.com> References: <20210601131229.630611-1-gjb@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,gjb@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1622553181; bh=BBBLEuPds/jmQs8OiVSaGalSUMJ9Kb0p5HWYn+Me9Dg=; h=Cc:Date:From:Reply-To:Subject:To; b=Mcc5i7pT7JVtyH4XtsWp234zPZJRTU6IgMbRsyLIQ4Lnt2y3KWSaVIOKZsXXEqn0OMG yo/Ri3S+AMgvxBqLFeqxjbkXpkRuVM57ZkUSqvOdIT/IblljBcdg1Y8nQG8HezecWMNZC XY+JYyPeFKLlhotS4QHESzVPt253x87aTig= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This commit allows to initialize Secure Boot default key and databases from data embedded in firmware binary. Signed-off-by: Grzegorz Bernacki Reviewed-By: Samer El-Haj-Mahmoud Reviewed-by: Pete Batard Reviewed-by: Sunny Wang --- Platform/RaspberryPi/RPi4/RPi4.dsc | 5 ++++- Platform/RaspberryPi/RPi4/RPi4.fdf | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4= /RPi4.dsc index d8c6fdd4bd..1fb4df0b81 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -164,7 +164,7 @@ !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBo= otVariableLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tr= ee PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf !else @@ -217,6 +217,7 @@ MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf =20 [LibraryClasses.common.UEFI_DRIVER] @@ -612,6 +613,8 @@ NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf } SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf + SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf + SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDef= aultKeysDxe.inf !else MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf !endif diff --git a/Platform/RaspberryPi/RPi4/RPi4.fdf b/Platform/RaspberryPi/RPi4= /RPi4.fdf index 1e13909a57..0e43d24c7a 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.fdf +++ b/Platform/RaspberryPi/RPi4/RPi4.fdf @@ -189,7 +189,9 @@ READ_LOCK_STATUS =3D TRUE INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.i= nf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE +!include SecurityPkg/SecureBootDefaultKeys.fdf.inc INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConf= igDxe.inf + INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBoo= tDefaultKeysDxe.inf !endif INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRu= ntimeDxe.inf INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#75901): https://edk2.groups.io/g/devel/message/75901 Mute This Topic: https://groups.io/mt/83232294/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-