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.web12.57418.1622553178932386231 for ; Tue, 01 Jun 2021 06:12:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=INXAyZ2L; 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 b18so17632913lfv.11 for ; Tue, 01 Jun 2021 06:12:58 -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=3UBLWzlWGYdRst9uiv6yH788pgxlMTrtECzBtOPn75w=; b=INXAyZ2Lwub1byZqn2lWSnApCBL2vgZ3hGTchtFe4Y17HOJGheFiVy2BwRmv4U3yG8 PVP3lRtXUkhNrigZpVV4MNPdW5fdj1Qi6U3lHC2gXw8lelPrXfzKdILWWOGll2gbYGWs nuFe2PoE9T106n6GkOpbw7rWZ2lrpvKuGblzatlzIc6e5mGNqV1YRsdmt+zOfwdn89wm ztKwmhuLakxZ9WxjzLXJ+J8u9nPUiF0zEQDlsnczbKzFn6w3kxD6d1rTBl/2dLNpfRif v9uaH5aVEuch4+ZjcTWK03G8jGMhGJYJzbOdK/wFj7i8zduHcMh7r6d7ij8xdbuj7rEH kY+g== 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=3UBLWzlWGYdRst9uiv6yH788pgxlMTrtECzBtOPn75w=; b=EjtL00myl5ck4z9wgnFJANuI5TWyb54AdINi7pbv6DVyjoRp7dfJ4XlGwsTFIuYG5y DHo6kqV6JsbHc73olbfusJjmXl7LJGyQ79Ed2Rs7dPc3MEvQ9+RtV+eneEv99cV6a9XR 25UKjd9cCFpAPIfN9g80f3j9YZIalLvmS98dptUJQpB6kriG0m10hgrS/KaX4bVE+MVu 7zfRGA13T5ATfcKF4d7ATj+yznQtF4ZB7is1oWgem2q3UPNMPMLA5nqSwe6U/cIT24BA 5tMRBBbwLQIb4S9fMkdnmMLeBSJKv1We73czQzvy/bi2mi4mPvHOiSroX9BnF6K6zptC /gbQ== X-Gm-Message-State: AOAM5337k8EtAuAfhkyZpUeu05Q0C1SR7LCCZp1XOM2SPOPpiureIBpE nAXDeLsRxmLiXIfqtKiy4QXCkMl0kUgfH+mD X-Google-Smtp-Source: ABdhPJxKAJs/0Pe3Hmgwoc/SpshJdsWkIupJqT8Y2rdW2VYB77xuAaSxz6FQss56cDT7XyUHIpURhg== X-Received: by 2002:ac2:560f:: with SMTP id v15mr8373161lfd.431.1622553177001; Tue, 01 Jun 2021 06:12:57 -0700 (PDT) Return-Path: Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id y5sm1681460lfa.148.2021.06.01.06.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 06:12:56 -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: [PATCH v2 4/6] SecurityPkg: Add EnrollFromDefaultKeys application. Date: Tue, 1 Jun 2021 15:12:27 +0200 Message-Id: <20210601131229.630611-6-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20210601131229.630611-1-gjb@semihalf.com> References: <20210601131229.630611-1-gjb@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This application allows user to force key enrollment from Secure Boot default variables. Signed-off-by: Grzegorz Bernacki --- SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf | 47 +++++++++ SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.c | 107 ++++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf create mode 100644 SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.c diff --git a/SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf b/SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf new file mode 100644 index 0000000000..4d79ca3844 --- /dev/null +++ b/SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf @@ -0,0 +1,47 @@ +## @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 = 1.28 + BASE_NAME = EnrollFromDefaultKeysApp + FILE_GUID = 6F18CB2F-1293-4BC1-ABB8-35F84C71812E + MODULE_TYPE = UEFI_APPLICATION + VERSION_STRING = 0.1 + ENTRY_POINT = UefiMain + +[Sources] + EnrollFromDefaultKeysApp.c + +[Packages] + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + SecurityPkg/SecurityPkg.dec + +[Guids] + gEfiCertPkcs7Guid + gEfiCertSha256Guid + gEfiCertX509Guid + gEfiCustomModeEnableGuid + gEfiGlobalVariableGuid + gEfiImageSecurityDatabaseGuid + gEfiSecureBootEnableDisableGuid + +[Protocols] + gEfiSmbiosProtocolGuid ## CONSUMES + +[LibraryClasses] + BaseLib + BaseMemoryLib + DebugLib + MemoryAllocationLib + PrintLib + UefiApplicationEntryPoint + UefiBootServicesTableLib + UefiLib + UefiRuntimeServicesTableLib + SecureBootVariableLib diff --git a/SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.c b/SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.c new file mode 100644 index 0000000000..1907ce1d4e --- /dev/null +++ b/SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.c @@ -0,0 +1,107 @@ +/** @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 // gEfiCustomModeEnableGuid +#include // EFI_SETUP_MODE_NAME +#include // EFI_IMAGE_SECURITY_DATABASE +#include // GUID_STRING_LENGTH +#include // CopyGuid() +#include // ASSERT() +#include // FreePool() +#include // AsciiSPrint() +#include // gBS +#include // AsciiPrint() +#include // gRT +#include +#include + +#define FAIL(fmt...) AsciiPrint("EnrollFromDefaultKeysApp: " fmt) + +/** + Entry point function of this shell application. +**/ +EFI_STATUS +EFIAPI +UefiMain ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + UINT8 SetupMode; + + Status = GetSetupMode (&SetupMode); + if (EFI_ERROR (Status)) { + FAIL ("Cannot get SetupMode variable: %r\n", Status); + return 1; + } + + if (SetupMode == USER_MODE) { + FAIL ("Skipped - USER_MODE\n"); + return 1; + } + + Status = SetSecureBootMode (CUSTOM_SECURE_BOOT_MODE); + if (EFI_ERROR (Status)) { + FAIL ("Cannot set CUSTOM_SECURE_BOOT_MODE: %r\n", Status); + return 1; + } + + Status = EnrollDbFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll db: %r\n", Status); + goto error; + } + + Status = EnrollDbxFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll dbt: %r\n", Status); + } + + Status = EnrollDbtFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll dbx: %r\n", Status); + } + + Status = EnrollKEKFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll KEK: %r\n", Status); + goto cleardbs; + } + + Status = EnrollPKFromDefault (); + if (EFI_ERROR (Status)) { + FAIL ("Cannot enroll PK: %r\n", Status); + goto clearKEK; + } + + Status = 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 = 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 1; +} -- 2.25.1