From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by mx.groups.io with SMTP id smtpd.web10.22198.1627640639851864164 for ; Fri, 30 Jul 2021 03:24:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=H4WFVsMt; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.44, mailfrom: gjb@semihalf.com) Received: by mail-lf1-f44.google.com with SMTP id x8so3563121lfe.3 for ; Fri, 30 Jul 2021 03:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sUALfK4YKDc4IeiZH80qsn/Ve7PpQxhY2X3odBiiUn4=; b=H4WFVsMtPBtnlBWJYqkR0KVgi1qiBleoh0eR9udRNk/lg9/pDaap+pvF8uzZpNY0O/ oIi8ArK7OjzVRZxf1BpnQsv5kohSCsdIx+nuYX/nQWslRRwt3x6Bu4V6aHhx8//SWZTX OO+tEVATXHYCh/OK0tf41n8yxCrfzKeLVQ61D8F7228mizjuYl7cHtdlr8SEfK7vl7EK yLzSytzAesJwT5uhd4GRa2B24EWSETk6tyAh68OT2QH/6YJZtmEN2JryIQYxd5Wo0zYp pWY/609AQ2pvglHRk1ercKHDxTaCLZtJfoj5q8h0gEkZT8hfrREDbOtD3HoZdUs0lP/o GM0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sUALfK4YKDc4IeiZH80qsn/Ve7PpQxhY2X3odBiiUn4=; b=h7U/HxhmCOh7xUupIE0SMvayN7Sqmub1iW6HdoFKw4hsH1HiObVgZYyzw4TINftCiY 8MBD5UQ6GWZAW/GdK9gSMQO8ACO/QFFfo+cD959kdW8EFs5yO07PXwhEOU2QfWKJQYi0 PSVUfioHmZh8lzJ5aE24bXNrrizGmL9Ttj/ZFhIs7YG5aut4xSl1o9I2QFeenPhrIO8x 00edCvadHRZgceKFyBZk8KxPYXQdUEpOikvd+N8INkl3lXsDgSabasIFK+7vC13ZLWeL 6w8JF5dkKUAAIdl4ULj+r2THiJL4nfGuIALeH7jJ3sTGWspxsoC+JO9GQjX/2N7MD/lH MJBA== X-Gm-Message-State: AOAM532jHzXT8h1fregdlsNNQGuQplw+GndPBJZPoJzKlFVZe+6WRcsy NjO6bN/cuTsVKF3ZBWL1qJblC30eAE3eOIEL X-Google-Smtp-Source: ABdhPJzFfkokSfsMPylEnYH6BR/v20hOE6huni0Jpn0V8eBa+s3HxKJOqTRE4Ao2vqQOveRZucxMkA== X-Received: by 2002:a05:6512:32c8:: with SMTP id f8mr1395954lfg.256.1627640638059; Fri, 30 Jul 2021 03:23:58 -0700 (PDT) Return-Path: Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id d5sm114174lfs.61.2021.07.30.03.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 03:23:57 -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, sami.mujawar@arm.com, afish@apple.com, ray.ni@intel.com, jordan.l.justen@intel.com, rebecca@bsdio.com, grehan@freebsd.org, thomas.abraham@arm.com, chasel.chiu@intel.com, nathaniel.l.desimone@intel.com, gaoliming@byosoft.com.cn, eric.dong@intel.com, michael.d.kinney@intel.com, zailiang.sun@intel.com, yi.qian@intel.com, graeme@nuviainc.com, rad@semihalf.com, pete@akeo.ie, Grzegorz Bernacki , Sunny Wang , Jiewen Yao Subject: [PATCH v7 10/11] SecurityPkg: Add new modules to Security package. Date: Fri, 30 Jul 2021 12:23:25 +0200 Message-Id: <20210730102326.2814466-11-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20210730102326.2814466-1-gjb@semihalf.com> References: <20210730102326.2814466-1-gjb@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This commits adds modules and dependencies related to initialization and usage of default Secure Boot key variables to SecurityPkg. Signed-off-by: Grzegorz Bernacki Reviewed-by: Sunny Wang Reviewed-by: Jiewen Yao Reviewed-by: Pete Batard Tested-by: Pete Batard on Raspberry Pi 4 --- SecurityPkg/SecurityPkg.dec | 14 ++++++++++++++ SecurityPkg/SecurityPkg.dsc | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index e30c39f321..d5ace6f654 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -198,6 +198,20 @@ ## GUID used to enforce loading order between Tcg2Acpi and Tcg2Smm gTcg2MmSwSmiRegisteredGuid = { 0x9d4548b9, 0xa48d, 0x4db4, { 0x9a, 0x68, 0x32, 0xc5, 0x13, 0x9e, 0x20, 0x18 } } + ## GUID used to specify section with default PK content + gDefaultPKFileGuid = { 0x85254ea7, 0x4759, 0x4fc4, { 0x82, 0xd4, 0x5e, 0xed, 0x5f, 0xb0, 0xa4, 0xa0 } } + + ## GUID used to specify section with default KEK content + gDefaultKEKFileGuid = { 0x6f64916e, 0x9f7a, 0x4c35, { 0xb9, 0x52, 0xcd, 0x04, 0x1e, 0xfb, 0x05, 0xa3 } } + + ## GUID used to specify section with default db content + gDefaultdbFileGuid = { 0xc491d352, 0x7623, 0x4843, { 0xac, 0xcc, 0x27, 0x91, 0xa7, 0x57, 0x44, 0x21 } } + + ## GUID used to specify section with default dbx content + gDefaultdbxFileGuid = { 0x5740766a, 0x718e, 0x4dc0, { 0x99, 0x35, 0xc3, 0x6f, 0x7d, 0x3f, 0x88, 0x4f } } + + ## GUID used to specify section with default dbt content + gDefaultdbtFileGuid = { 0x36c513ee, 0xa338, 0x4976, { 0xa0, 0xfb, 0x6d, 0xdb, 0xa3, 0xda, 0xfe, 0x87 } } [Ppis] ## The PPI GUID for that TPM physical presence should be locked. diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 99c227dad2..64157e20f9 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -73,7 +73,7 @@ SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf -[LibraryClasses.ARM] +[LibraryClasses.ARM, LibraryClasses.AARCH64] # # It is not possible to prevent the ARM compiler for generic intrinsic functions. # This library provides the intrinsic functions generate by a given compiler. @@ -149,6 +149,7 @@ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf + HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf @@ -260,6 +261,10 @@ [Components.IA32, Components.X64, Components.ARM, Components.AARCH64] SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf + SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf + SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf + SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf [Components.IA32, Components.X64, Components.AARCH64] # -- 2.25.1