From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by mx.groups.io with SMTP id smtpd.web11.5965.1626265807656997714 for ; Wed, 14 Jul 2021 05:30:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=xBcUewdn; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.45, mailfrom: gjb@semihalf.com) Received: by mail-lf1-f45.google.com with SMTP id u13so3254371lfs.11 for ; Wed, 14 Jul 2021 05:30:07 -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:mime-version :content-transfer-encoding; bh=dziueembx5uv+8DmbISN3jd1jN2Q3vNK3D9MDCtRIro=; b=xBcUewdn0Tt84m28/Hr0o/BxxsIPJ08ODnYRh4eYqbeXUcVqb5I/w4omKZ9b9CL/UL P7POt4lSDsFl58d8b/+b5o9d97WpHbDbdLUyh8I3BFNQCJft0YD5HzauMXxaCjI2MdKM oX3b+3N8efs+zpI+AT/NeEe851Aj7DpCeeu+WhcB/h1rK05z9rl2R1Azw2ADBP2hs/vj pQBo9C23lUVy3UHA7QWMy8z/8CVnMAJvsJqYsRXtiTGL/PLowB6fW4gOY/BziSEKQj/e zVzTiMitG9xDIPhV9IHTrpcqVZG4tUDoTCSATa874cLQmDxdGZ4p+DkgXJYRq2+UDyKj 9E8Q== 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:mime-version :content-transfer-encoding; bh=dziueembx5uv+8DmbISN3jd1jN2Q3vNK3D9MDCtRIro=; b=hB4JdRERMvH4nRiWWEgUcEjugX5woGiTFapZx368xCZE2ef5DFbcrXHOntqCKziRAx 3GOSVuXjPwteSxUqU0txIRpQx2Tytmmtgkz6djsMlc4QxVisJXBr5c8p9KojqA3pVcFq wpKP/4Zr8SH66sU5d2L+MKROEtXL6GGc5l+PgUyMbAeXU/mwujCuwo/muBgo+7YB5CuF RKQnOyNyrwg4SLgujjtfzNnShsOV41g2R07klyg/rs3ThPl6Yhex0Zi3npauHc36RfPv qICWzlGqzdFhhHNMKiDmPJTBxOT4xLbspi5aTQyNoQMmRRKF5COKXb4sF6nRVA+x0rJ4 ITOQ== X-Gm-Message-State: AOAM532cXRF2Oc+e+WABmn0S4qcHI/quZvklIKbAWdILo6jstZQWDga5 PgGuYNhcRIx9v4deYuNHRvwE8HiyRjr9uPrK X-Google-Smtp-Source: ABdhPJyWd/pR65aWZb/aR9EEDma3gc/ItS0PJCk69TPhIBnXerP19o699mjqHi09VyH5diGbFzqTtw== X-Received: by 2002:ac2:5684:: with SMTP id 4mr7757538lfr.386.1626265805716; Wed, 14 Jul 2021 05:30:05 -0700 (PDT) Return-Path: Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id j2sm224846ljc.49.2021.07.14.05.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 05:30:04 -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 Subject: [PATCH v6 00/11] Secure Boot default keys Date: Wed, 14 Jul 2021 14:29:41 +0200 Message-Id: <20210714122952.1340890-1-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This patchset adds support for initialization of default Secure Boot variables based on keys content embedded in flash binary. This feature is active only if Secure Boot is enabled and DEFAULT_KEY is defined. The patchset consist also application to enroll keys from default variables and secure boot menu change to allow user to reset key content to default values. Discussion on design can be found at: https://edk2.groups.io/g/rfc/topic/82139806#600 Built with: GCC - RISC-V (U500, U540) [requires fixes in dsc to build] - Intel (Vlv2TbltDevicePkg (X64/IA32), Quark, MinPlatformPkg, EmulatorPkg (X64), Bhyve, OvmfPkg (X64/IA32)) - ARM (Sgi75,SbsaQemu,DeveloperBox, RPi3/RPi4) RISC-V, Quark, Vlv2TbltDevicePkg, Bhyve requires additional fixes to be built, will be post on edk2 maillist later VS2019 - Intel (OvmfPkgX64) Test with: GCC5/RPi4 VS2019/OvmfX64 (requires changes to enable feature) Tests: 1. Try to enroll key in incorrect format. 2. Enroll with only PKDefault keys specified. 3. Enroll with all keys specified. 4. Enroll when keys are enrolled. 5. Reset keys values. 6. Running signed & unsigned app after enrollment. Changes since v1: - change names: SecBootVariableLib => SecureBootVariableLib SecBootDefaultKeysDxe => SecureBootDefaultKeysDxe SecEnrollDefaultKeysApp => EnrollFromDefaultKeysApp - change name of function CheckSetupMode to GetSetupMode - remove ShellPkg dependecy from EnrollFromDefaultKeysApp - rebase to master Changes since v2: - fix coding style for functions headers in SecureBootVariableLib.h - add header to SecureBootDefaultKeys.fdf.inc - remove empty line spaces in SecureBootDefaultKeysDxe files - revert FAIL macro in EnrollFromDefaultKeysApp - remove functions duplicates and add SecureBootVariableLib to platforms which used it Changes since v3: - move SecureBootDefaultKeys.fdf.inc to ArmPlatformPkg - leave duplicate of CreateTimeBasedPayload in PlatformVarCleanupLib - fix typo in guid description Changes since v4: - reorder patches to make it bisectable - split commits related to more than one platform - move edk2-platform commits to separate patchset Changes since v5: - split SecureBootVariableLib into SecureBootVariableLib and SecureBootVariableProvisionLib Grzegorz Bernacki (11): SecurityPkg: Create SecureBootVariableLib. SecurityPkg: Create library for enrolling Secure Boot variables. ArmVirtPkg: add SecureBootVariableLib class resolution OvmfPkg: add SecureBootVariableLib class resolution EmulatorPkg: add SecureBootVariableLib class resolution SecurityPkg: Remove duplicated functions from SecureBootConfigDxe. ArmPlatformPkg: Create include file for default key content. SecurityPkg: Add SecureBootDefaultKeysDxe driver SecurityPkg: Add EnrollFromDefaultKeys application. SecurityPkg: Add new modules to Security package. SecurityPkg: Add option to reset secure boot keys. SecurityPkg/SecurityPkg.dec | 14 + ArmVirtPkg/ArmVirt.dsc.inc | 2 + EmulatorPkg/EmulatorPkg.dsc | 2 + OvmfPkg/Bhyve/BhyveX64.dsc | 2 + OvmfPkg/OvmfPkgIa32.dsc | 2 + OvmfPkg/OvmfPkgIa32X64.dsc | 2 + OvmfPkg/OvmfPkgX64.dsc | 2 + SecurityPkg/SecurityPkg.dsc | 5 + SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf | 48 ++ SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf | 80 +++ SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf | 80 +++ SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf | 3 + SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf | 46 ++ SecurityPkg/Include/Library/SecureBootVariableLib.h | 153 ++++++ SecurityPkg/Include/Library/SecureBootVariableProvisionLib.h | 134 +++++ SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigNvData.h | 2 + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr | 6 + SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.c | 110 +++++ SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.c | 511 ++++++++++++++++++++ SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.c | 491 +++++++++++++++++++ SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c | 344 ++++++------- SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.c | 69 +++ ArmPlatformPkg/SecureBootDefaultKeys.fdf.inc | 70 +++ SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.uni | 17 + SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.uni | 16 + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigStrings.uni | 4 + SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.uni | 16 + 27 files changed, 2043 insertions(+), 188 deletions(-) create mode 100644 SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.inf create mode 100644 SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf create mode 100644 SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf create mode 100644 SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf create mode 100644 SecurityPkg/Include/Library/SecureBootVariableLib.h create mode 100644 SecurityPkg/Include/Library/SecureBootVariableProvisionLib.h create mode 100644 SecurityPkg/EnrollFromDefaultKeysApp/EnrollFromDefaultKeysApp.c create mode 100644 SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.c create mode 100644 SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.c create mode 100644 SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.c create mode 100644 ArmPlatformPkg/SecureBootDefaultKeys.fdf.inc create mode 100644 SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.uni create mode 100644 SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.uni create mode 100644 SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.uni -- 2.25.1