From nobody Thu May 16 06:55:40 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+75650+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+75650+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1622031120; cv=none; d=zohomail.com; s=zohoarc; b=ckLMiE9GnefI2cqvVuj710qFIiG1i3By63fcqTDCa+WGIMA/SXRphRm/s8qPxpUdkTqeTu5vbyQgASKP/1XWvP2EMYPn1PqdfNMKFXKWYWjHfgLeCjytP5VYKqpY9YDQxlIH9Txh2P+VAU5ot3+zPSjOrl8UK5OeDV+5liXwm/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622031120; 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=+y8XxR8s35BnZK0aPFLvdCPguz2Jkwv3MMRKeYnR2PQ=; b=Bi9vhErkRHYSr35Jbcwt/GPZ2oslgboKRovaP7DWURoLbcYvbpry3pCdnarDtoTVz9d/4d2oDAzPnlmVmtdOYeuNfv3bPjl3Y91f9A2FL07NZWNUrTN/knph93dHVoNvj3QOvYs+GY76qD6tN/oudHHwlYcHbu8K/Aftn6CMe0Q= 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+75650+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1622031120557502.3647202688119; Wed, 26 May 2021 05:12:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2n6uYY1788612xbMv8p2AGoM; Wed, 26 May 2021 05:11:59 -0700 X-Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mx.groups.io with SMTP id smtpd.web12.5223.1622022158509051952 for ; Wed, 26 May 2021 02:42:38 -0700 X-Received: by mail-lf1-f46.google.com with SMTP id r5so1578636lfr.5 for ; Wed, 26 May 2021 02:42:38 -0700 (PDT) X-Gm-Message-State: R6jZtHV56ERMWuzC2gLBghs1x1787277AA= X-Google-Smtp-Source: ABdhPJyqQe/gO2P/fje0p1Mrl0O1ykGzFF2YZWLUaFwT8v3p/GTzFxxppe+CYN5zwBegAE7/C84OVw== X-Received: by 2002:a19:ee17:: with SMTP id g23mr1503562lfb.438.1622022156364; Wed, 26 May 2021 02:42:36 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id y19sm2380268ljy.32.2021.05.26.02.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 02:42:35 -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, gjb@semihalf.com, upstream@semihalf.com, jiewen.yao@intel.com, jian.j.wang@intel.com, min.m.xu@intel.com, lersek@redhat.com Subject: [edk2-devel] [edk2-platforms PATCH] Platform/RaspberryPi: Enable default Secure Boot variables initialization Date: Wed, 26 May 2021 11:41:58 +0200 Message-Id: <20210526094204.73600-2-gjb@semihalf.com> In-Reply-To: <20210526094204.73600-1-gjb@semihalf.com> References: <20210526094204.73600-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=1622031119; bh=n+CgNqPdheA/jiHc66RahGY5OsB9z1SbJWlYfhjHqjw=; h=Cc:Date:From:Reply-To:Subject:To; b=a0EZeaYSsgxlxYF3zWMU8FC0rNuaaCKcKrJyQvmypMnDBng/mkVa19+fVAAvuRuUep4 NZyymNw5vxifiDNdDZvdcWmDHpQthE15Al2gQBfAk6OJ6YZiVvzfkfihKWD9Vo+5EzCTD qj3TuT84SRumHC9v2UvNYxPj2cURbAzPlfc= 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 --- 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..e99730f12b 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 - + SecBootVariableLib|SecurityPkg/Library/SecBootVariableLib/SecBootVariabl= eLib.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/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.inf + SecurityPkg/VariableAuthenticated/SecBootDefaultKeysDxe/SecBootDefaultKe= ysDxe.inf !else MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf !endif diff --git a/Platform/RaspberryPi/RPi4/RPi4.fdf b/Platform/RaspberryPi/RPi4= /RPi4.fdf index 1e13909a57..558824fbb3 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/SecBootDefaultKeysDxe/SecBootDefau= ltKeysDxe.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 (#75650): https://edk2.groups.io/g/devel/message/75650 Mute This Topic: https://groups.io/mt/83098882/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-