From nobody Tue Feb 10 01:31:37 2026 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+75654+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+75654+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1622031118; cv=none; d=zohomail.com; s=zohoarc; b=kCCWvhfxFHEVlRVNZdY24FXZhrY8NXqdrQwgfthGbG7bUKZ+bCxiWQoyCdZ6reWUP5hiwAJtPNT+m/+xJVqsZ9gLTF+AhjF0IsDG5DVfva1y3PtajpESU5dwg5ZSEKuY/nrIkGBHOosV7ZQafkmjtxgpyoH0Ov0H6GQAPm7bJVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622031118; 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=fVUEuOYox/lya/xOoP6OL8UvPcjOUvmtB6nuUDpwL44=; b=QCMVF8i09DwlWdpfDsYZAPJiNU733+3Hl3hyUbpb2sWcNDORyjDwVLz0zynfTZezBdOlkCwSg6MhFG6fbYLXInM8LJAof0+Lpa3b9i/oBKQeXqmnpjgj4pjLmoa16wYquzdt+5DKzOdjdMc2MjHYko7y21lWQutKumvgVgC/otk= 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+75654+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1622031118153344.4248060405405; Wed, 26 May 2021 05:11:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id haJBYY1788612x0I5c67Uczb; Wed, 26 May 2021 05:11:57 -0700 X-Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by mx.groups.io with SMTP id smtpd.web11.5129.1622022162640359969 for ; Wed, 26 May 2021 02:42:43 -0700 X-Received: by mail-lf1-f41.google.com with SMTP id i22so1548555lfl.10 for ; Wed, 26 May 2021 02:42:42 -0700 (PDT) X-Gm-Message-State: TLf6JRIwEmwi6SpUl7oHHUwzx1787277AA= X-Google-Smtp-Source: ABdhPJxKzG2MXd+dasscMAqd0tzFNLX1dE9gbDJJTPBTNMb97GKcVHIsbuuBVXv++P7ia/YCueJb5g== X-Received: by 2002:a05:6512:2313:: with SMTP id o19mr1614172lfu.237.1622022160570; Wed, 26 May 2021 02:42:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 02:42:40 -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] [PATCH 4/6] SecurityPkg: Add SecEnrollDefaultKeys application. Date: Wed, 26 May 2021 11:42:02 +0200 Message-Id: <20210526094204.73600-6-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=1622031117; bh=TBp0kO8M0M/+NWNAHtsbsGdurfPMi7u3SGTnQV8kx3w=; h=Cc:Date:From:Reply-To:Subject:To; b=hBEgOcDMdnPza0D6rgiY6X3M0b5maQ/WdnN8E2fjy6ssbOgZzdPD4kN8NOj6znEkobk GF1KP7l5RyjkeONzKyD2hF/GjPxYnUkLrETcGOk7mDTAGXheeR7PBUoUdtt2wKSDBafur pC8Jf4Nvafy1B1uE2Ampbyy8z7L1nyY53RA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This application allows user to force key enrollment from Secure Boot default variables. Signed-off-by: Grzegorz Bernacki --- SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.inf | 48 ++++= +++++ SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.c | 108 ++++= ++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKey= sApp.inf create mode 100644 SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKey= sApp.c diff --git a/SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.in= f b/SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.inf new file mode 100644 index 0000000000..9d575ae0ac --- /dev/null +++ b/SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.inf @@ -0,0 +1,48 @@ +## @file +# Enroll PK, KEK, db, dbx from Default variables +# +# Copyright (c) 2021, ARM Ltd. All rights reserved.
+# Copyright (c) 2021, Semihalf All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +[Defines] + INF_VERSION =3D 1.28 + BASE_NAME =3D SecEnrollDefaultKeysApp + FILE_GUID =3D 6F18CB2F-1293-4BC1-ABB8-35F84C71812E + MODULE_TYPE =3D UEFI_APPLICATION + VERSION_STRING =3D 0.1 + ENTRY_POINT =3D ShellCEntryLib + +[Sources] + SecEnrollDefaultKeysApp.c + +[Packages] + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + SecurityPkg/SecurityPkg.dec + ShellPkg/ShellPkg.dec + +[Guids] + gEfiCertPkcs7Guid + gEfiCertSha256Guid + gEfiCertX509Guid + gEfiCustomModeEnableGuid + gEfiGlobalVariableGuid + gEfiImageSecurityDatabaseGuid + gEfiSecureBootEnableDisableGuid + +[Protocols] + gEfiSmbiosProtocolGuid ## CONSUMES + +[LibraryClasses] + BaseLib + BaseMemoryLib + DebugLib + MemoryAllocationLib + PrintLib + ShellCEntryLib + UefiBootServicesTableLib + UefiLib + UefiRuntimeServicesTableLib + SecBootVariableLib diff --git a/SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.c = b/SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.c new file mode 100644 index 0000000000..b66dd93a7a --- /dev/null +++ b/SecurityPkg/SecEnrollDefaultKeysApp/SecEnrollDefaultKeysApp.c @@ -0,0 +1,108 @@ +/** @file + Enroll default PK, KEK, db, dbx. + +Copyright (c) 2021, ARM Ltd. All rights reserved.
+Copyright (c) 2021, Semihalf All rights reserved.
+ +SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#include // gEfiCustomModeEnableGu= id +#include // EFI_SETUP_MODE_NAME +#include // EFI_IMAGE_SECURITY_DAT= ABASE +#include // GUID_STRING_LENGTH +#include // CopyGuid() +#include // ASSERT() +#include // FreePool() +#include // AsciiSPrint() +#include // ShellAppMain() +#include // gBS +#include // AsciiPrint() +#include // gRT +#include +#include + +#define FAIL(fmt...) AsciiPrint("SecEnrollDefaultKeysApp: " fmt) + +/** + Entry point function of this shell application. +**/ +INTN +EFIAPI +ShellAppMain ( + IN UINTN Argc, + IN CHAR16 **Argv + ) +{ + EFI_STATUS Status; + UINT8 SetupMode; + + Status =3D CheckSetupMode (&SetupMode); + if (EFI_ERROR (Status)) { + FAIL ("Cannot get SetupMode variable: %r\n", Status); + return 1; + } + + if (SetupMode =3D=3D USER_MODE) { + FAIL ("Skipped - USER_MODE\n"); + return 1; + } + + Status =3D SetSecureBootMode (CUSTOM_SECURE_BOOT_MODE); + if (EFI_ERROR (Status)) { + FAIL ("Cannot set CUSTOM_SECURE_BOOT_MODE: %r\n", Status); + return 1; + } + + Status =3D EnrollDbFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll db: %r\n", Status); + goto error; + } + + Status =3D EnrollDbxFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll dbt: %r\n", Status); + } + + Status =3D EnrollDbtFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll dbx: %r\n", Status); + } + + Status =3D EnrollKEKFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll KEK: %r\n", Status); + goto cleardbs; + } + + Status =3D EnrollPKFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll PK: %r\n", Status); + goto clearKEK; + } + + Status =3D SetSecureBootMode (STANDARD_SECURE_BOOT_MODE); + if (EFI_ERROR (Status)) { + FAIL ("Cannot set CustomMode to STANDARD_SECURE_BOOT_MODE\n" + "Please do it manually, otherwise system can be easily compromised\n= "); + } + return 0; + +clearKEK: + DeleteKEK (); + +cleardbs: + DeleteDbt (); + DeleteDbx (); + DeleteDb (); + +error: + Status =3D SetSecureBootMode (STANDARD_SECURE_BOOT_MODE); + if (EFI_ERROR (Status)) { + AsciiPrint ("SecEnrollDefaultKeysApp: Cannot set CustomMode to STANDAR= D_SECURE_BOOT_MODE\n" + "Please do it manually, otherwise system can be easily compromised\n= "); + } + + return 1; +} --=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 (#75654): https://edk2.groups.io/g/devel/message/75654 Mute This Topic: https://groups.io/mt/83098886/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-