From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.10812.1600429635644348349 for ; Fri, 18 Sep 2020 04:47:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=yUTPPzMu; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: ray.ni@intel.com) IronPort-SDR: y1lGZb+XzGac4LedUeGdkYO7kEjCdJYDv96wGQCg+oaffZfzgJziMRkSOHXNO1olqb+xlXPFj+ sggwi3ScGZHQ== X-IronPort-AV: E=McAfee;i="6000,8403,9747"; a="147598459" X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208,217";a="147598459" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 04:47:14 -0700 IronPort-SDR: OBj1BQoYsYVKUYG8X9/VrRT7ODzVtZLJPo+SlIfirdfovPuaYDx/Oxv6wMmsl7KbnGbJrNE2wo NoQAXRHT3lGA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208,217";a="344718759" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by FMSMGA003.fm.intel.com with ESMTP; 18 Sep 2020 04:47:13 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 18 Sep 2020 04:47:13 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 18 Sep 2020 04:47:13 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.36.55) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Fri, 18 Sep 2020 04:47:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B/P6MUgz5jSnHF/8Lc7N2bDbuJqFz4zqPPw8q4C/UwxmnrvWYGE3qu8eh0j50EOSlFXSLvedsBl/4gATl7S9flZqAUtMbq/1CHYg4kKEtWbaRGV9JojjU18hdpU2EToqoHh6qnDEJoEVKDc4HA1BdLeueXH5c42N1pM3IFSaMrEqVmjiXkyKVSfDa7eAu5LrRkylpbSVmILyivmuwszvVAE3hibU8HxQm2ApH4M7/M5QUtwgk0/3TZseD8viADnY4W62g9AwFIX1u671LPnedmPSLaXm/6I7mLbNCzLRNsAkSjIPOn0h7nwoSLfqm38uWyul8LSuT2a2ixeNi8Uf6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j/VEkeOOB2dgdhiiuCCMLpYtWm4I5UVpp5b3fO/K+q8=; b=kAjnXPGGvW4lQieSGsYooyARtCbpzc4Kylt7T6gvRly2Sn1kNq6H47y0WnUpzmX2pPyb9sd+g5yx3T+Jvx2zdI/3TfeCohG75DHeD7zmrJf7eXKF5r6sJE2CTkt0e/kDg8oVyCgAED9Gv1ru6rnh741nioQebqmWz82Dg7EAABkR2opzkwkB0CBsCuhX4sie0zRDQmVxX/XWLq9A+8qMZ9XFtSnYqEccPNUZkhX69iMbJ9UakRQ4KSi5b1S0bacs6kBRjmp+ugQOyePwPK0XzUzjIRDHk4PdKLuDyy/n2286cVF29S3IAbpQBbUcbf7Gc325JLfmFizR8GjflZm9vQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j/VEkeOOB2dgdhiiuCCMLpYtWm4I5UVpp5b3fO/K+q8=; b=yUTPPzMumfFuKHY4f+RCEFwc3AuRuzhZonNtFEDeCYVczlhBJYQiPlgXHt2iPaNv2YDedWy5dFsN6ZHY5I07rFXEDJXiZuGUa7KH2lH9TnrcPUWdawq8jGaMOqdbKxZS4X/VycumFhpQ0c46RDEzYWHiLZ3otONz9ZK5t2S+qCU= Received: from BY5PR11MB4007.namprd11.prod.outlook.com (2603:10b6:a03:189::28) by BYAPR11MB2600.namprd11.prod.outlook.com (2603:10b6:a02:c8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Fri, 18 Sep 2020 11:47:11 +0000 Received: from BY5PR11MB4007.namprd11.prod.outlook.com ([fe80::1533:4053:1c45:3596]) by BY5PR11MB4007.namprd11.prod.outlook.com ([fe80::1533:4053:1c45:3596%6]) with mapi id 15.20.3370.019; Fri, 18 Sep 2020 11:47:11 +0000 From: "Ni, Ray" To: "Wadhawan, Divneil R" , "devel@edk2.groups.io" CC: gaoliming , 'Andrew Fish' , "Justen, Jordan L" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for Secure Boot Thread-Topic: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for Secure Boot Thread-Index: AdaMQS9sqEhJ/RVOQYWR22UtRyYHlAAgXCCgAABlWnAAAbCaMAA5kd/A Date: Fri, 18 Sep 2020 11:47:11 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.218] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ee56af52-5a18-44b1-04eb-08d85bc8947f x-ms-traffictypediagnostic: BYAPR11MB2600: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: osOt4LpmtUvugvKbuo9+xWzP/mB++10c0crpJYU3Uh93SapusyhScdUuplwFJMs0emYVz2zASDltCY/xfsJpfbDXbDA6E228pd+d13dPhmCcUcP+6MToW/POc2RGu++PONdxIJobnsShxLME+XY6WOwXQrfDJp3qkN1fkNryY87JHvWKaPT0CgDDuwWyMKU0+s1vQm6jiQO+XSyLHPyPRz+zi2uujzvQDEHs+x60dhOw+VvCivIB7Ow/IUoFj3gfLFTfTyPRgzaWD6f+6tvT1Wq9nvqDuT1y2Pxa6arjBSGXB58apOhDWg/l0WZMlQjW3lnOFkYt4U+5N07a33pkyUuj9G8MfD0bN1bJ7XOb85hfbN8itsIx7QZC6SI5K5O8gGq0mVOifEeGTp7UJIOgUQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB4007.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(346002)(396003)(39860400002)(366004)(136003)(7696005)(66446008)(110136005)(166002)(4326008)(8676002)(54906003)(83380400001)(66946007)(66556008)(478600001)(64756008)(66476007)(8936002)(55016002)(86362001)(9686003)(26005)(107886003)(966005)(52536014)(53546011)(316002)(2906002)(5660300002)(33656002)(186003)(76116006)(6506007)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: dK0JgX0CgIqk2NjpSaeZZCi+OCwgSbPGl5vgMA7AtuNi+VpzIq6KB9gxy6JCKV5Ckf7s0Ydk7GQ6ngafjElq5MbRFiRMeob45yHvwlkZK95CH6glYLYpSLwZ+8h/rOT+PZdEl98iEjgX25TKbqkeUj0MsmX2ZsOkbOBmwwio1cwAiKxlg1I/T66iJfGNS1bW48hf4UwHaUTrnvD58cHd7AVELsN3pZ7hekkbDIVQUxNkxQJmFGZUZwBa1esauZd18WqYAsEVw5gOjeIo+APaBj2uvoXlGVWE7/AsL08+LwctpcjbLZ8QDR/6TsPvtutn9ETQE0bml7ODJxbmJdtO+4TIXs8UeYM8m2LgdJSubBmeF++C3ptTF13ZM8cu8/chq0fUGNolup49WhltHITJeFIEn7BDux8nXwjG3ED9sF8dLt5dG6yZvvMWpPESMzWZ+TwHxT1IUVlMSZn/cKUxZdhXyH70X9mOpc9/e9vdJAMKbpmoX8cc4htZwAQK5OPsw+JiOwCBe0Rt0kFBhBS2SEqNnvtG08/3BIuNOiNJlVMgyyTr9zef9k6VAMk3zTXGZk8Af4CQmg/6iS0F+OjgPORppmvKa/+Bob127XxAeYf+8sxN00QQpnw7dcWH2JeQ1dJ16JLe9LvLHCrJ+dKYUw== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB4007.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee56af52-5a18-44b1-04eb-08d85bc8947f X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Sep 2020 11:47:11.4704 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: KAaFA3FTBIBuOcks8fjHyuoN5g/V6uzpMfRYqn1WVNkdMtdpfg2+vLjsda782xY8xY3Q4DQO71Oyv12nui5ZRQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2600 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_BY5PR11MB40075EEF34052828B4C9BCB68C3F0BY5PR11MB4007namp_" --_000_BY5PR11MB40075EEF34052828B4C9BCB68C3F0BY5PR11MB4007namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Divneil, pull request is created: https://github.com/tianocore/edk2/pull/941 If it succeeds, the patch will be merged automatically. If it fails, please check the specific failure message and provide updated = patch. Thanks, Ray From: Ni, Ray Sent: Thursday, September 17, 2020 4:19 PM To: Wadhawan, Divneil R ; devel@edk2.groups.i= o Cc: gaoliming ; 'Andrew Fish' ; = Justen, Jordan L ; Kinney, Michael D Subject: RE: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for Secure= Boot Reviewed-by: Ray Ni > From: Wadhawan, Divneil R > Sent: Thursday, September 17, 2020 3:43 PM To: Ni, Ray >; devel@edk2.groups.= io Cc: gaoliming >; = 'Andrew Fish' >; Justen, Jordan L <= jordan.l.justen@intel.com>; Kinney, Micha= el D >; Wadha= wan, Divneil R > Subject: RE: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for Secure= Boot Hi Ray, Yes, I have tested the following: 1. SECURE_BOOT_ENABLE=3Dtrue * Key Enrollment (PK, KEK, db) via custom mode * Execution of unit test shell application (signed one works okay, unsi= gned gives an Access denied) 1. SECURE_BOOT_ENABLE=3Dfalse (default case) * Secure Boot Configuration menu is not visible (Same as existing defau= lt case) * Execution of Unit Test Application (Signed/Unsigned both works okay) I am planning to post the script in BZ: https://bugzilla.tianocore.org/show= _bug.cgi?id=3D2949 in a day or too. The script generates the full key hierarchy that makes it easy to test this= patch. The patch in BZ requires modifications as per Mike's comment, so, you can s= kip the patches in BZ for now. Regards, Divneil From: Ni, Ray > Sent: Thursday, September 17, 2020 12:49 PM To: Wadhawan, Divneil R >; devel@edk2.groups.io Cc: gaoliming >; = 'Andrew Fish' >; Justen, Jordan L <= jordan.l.justen@intel.com>; Kinney, Micha= el D > Subject: RE: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for Secure= Boot Divneil, Just want to double confirm: did you test the secure boot and non-secure bo= ot? Thanks, Ray From: Wadhawan, Divneil R > Sent: Wednesday, September 16, 2020 11:53 PM To: devel@edk2.groups.io Cc: Ni, Ray >; gaoliming >; 'Andrew Fish' >; Justen, Jordan L >; Kinney, Michael D >; Wadhawan, Divneil R > Subject: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for Secure Boo= t SECURE_BOOT_ENABLE feature flag is introduced to enable Secure Boot. The following gets enabled with this patch: o Secure Boot Menu in "Device Manager" for enrolling keys o Storage space for Authenticated Variables o Authenticated execution of 3rd party images Signed-off-by: Divneil Rai Wadhawan > --- EmulatorPkg/EmulatorPkg.dsc | 37 +++++++++++++++++++++++++++++++++++-- EmulatorPkg/EmulatorPkg.fdf | 14 ++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 86a6271735..c6e25c745e 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -32,6 +32,7 @@ DEFINE NETWORK_TLS_ENABLE =3D FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE DEFINE NETWORK_ISCSI_ENABLE =3D FALSE + DEFINE SECURE_BOOT_ENABLE =3D FALSE [SkuIds] 0|DEFAULT @@ -106,12 +107,20 @@ LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/C= puExceptionHandlerLibNull.inf TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf - AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf SortLib|MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf + PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecu= reLibNull.inf + AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf +!else + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf +!endif + [LibraryClasses.common.SEC] PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.i= nf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf @@ -162,6 +171,16 @@ TimerLib|EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf EmuThunkLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_DRIVER, Libr= aryClasses.common.UEFI_APPLICATION] +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf +!endif + +[LibraryClasses.common.DXE_RUNTIME_DRIVER] +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +!endif + [LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVE= R, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION= ] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf @@ -190,6 +209,10 @@ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x002a0000 gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0x10000 gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"../FV/FV_RECOVERY.fd" +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 + gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE +!endif gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64" @@ -306,7 +329,14 @@ EmulatorPkg/ResetRuntimeDxe/Reset.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf + + MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { + +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf +!endif + } + MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.in= f EmulatorPkg/EmuThunkDxe/EmuThunk.inf @@ -315,6 +345,9 @@ EmulatorPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.inf EmulatorPkg/TimerDxe/Timer.inf +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDx= e.inf +!endif MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf index 295f6f1db8..b256aa9397 100644 --- a/EmulatorPkg/EmulatorPkg.fdf +++ b/EmulatorPkg/EmulatorPkg.fdf @@ -46,10 +46,17 @@ DATA =3D { # Blockmap[1]: End 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ## This is the VARIABLE_STORE_HEADER +!if $(SECURE_BOOT_ENABLE) =3D=3D FALSE #Signature: gEfiVariableGuid =3D # { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0= xfe, 0x7d }} 0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41, 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d, +!else + # Signature: gEfiAuthenticatedVariableGuid =3D + # { 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0= x77, 0x92 }} + 0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43, + 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92, +!endif #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableS= ize) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) =3D 0xBFB8 # This can speed up the Variable Dispatch a bit. 0xB8, 0xBF, 0x00, 0x00, @@ -186,6 +193,13 @@ INF RuleOverride =3D UI MdeModulePkg/Application/UiAp= p/UiApp.inf INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf INF MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf +# +# Secure Boot Key Enroll +# +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE +INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig= Dxe.inf +!endif + # # Network stack drivers # -- 2.24.1.windows.2 --_000_BY5PR11MB40075EEF34052828B4C9BCB68C3F0BY5PR11MB4007namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Divneil,

pull request is created: https://github.com/tianocore/edk2/pull/941

 

If it succeeds, the patch will be merged automatical= ly.

If it fails, please check the specific failure messa= ge and provide updated patch.

 

Thanks,

Ray

 

From: Ni, Ray
Sent: Thursday, September 17, 2020 4:19 PM
To: Wadhawan, Divneil R <divneil.r.wadhawan@intel.com>; devel@= edk2.groups.io
Cc: gaoliming <gaoliming@byosoft.com.cn>; 'Andrew Fish' <af= ish@apple.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Kinn= ey, Michael D <michael.d.kinney@intel.com>
Subject: RE: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for= Secure Boot

 

Reviewed-by: Ray Ni <ray.ni@intel.com>

 

From: Wadhawan, Divneil R <divneil.r.wadhawan@intel.com>
Sent: Thursday, September 17, 2020 3:43 PM
To: Ni, Ray <ray.ni@intel.com= >; devel@edk2.groups.io
Cc: gaoliming <gaolim= ing@byosoft.com.cn>; 'Andrew Fish' <afish@apple.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Kinney, Michael D <michae= l.d.kinney@intel.com>; Wadhawan, Divneil R <divneil.r.wadhawan@intel.com>
Subject: RE: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for= Secure Boot

 

Hi Ray,

 

Yes, I have tested the following:

 

  1. SECURE_BOOT_ENABLE=3Dtrue
  • Key Enrollment (PK, KEK, db) via custom mode
  • Exe= cution of unit test shell application (signed one works okay, unsigned give= s an Access denied)

 

  1. SECURE_BOOT_ENABLE=3Dfalse (default case)
  • Secure Boot Configuration menu is not visible (Same as existing defau= lt case)
  • Execution of Unit Test Application (Signed/Un= signed both works okay)

 

I am planning to post the script in BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2949 in a day or too.<= o:p>

The script generates the full key hierarchy that mak= es it easy to test this patch.

The patch in BZ requires modifications as per Mike&#= 8217;s comment, so, you can skip the patches in BZ for now.

 

Regards,

Divneil

 

From: Ni, Ray <ray.ni@intel.com>
Sent: Thursday, September 17, 2020 12:49 PM
To: Wadhawan, Divneil R <divneil.r.wadhawan@intel.com>; devel@edk2.groups.io
Cc: gaoliming <gaolim= ing@byosoft.com.cn>; 'Andrew Fish' <afish@apple.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Kinney, Michael D <michae= l.d.kinney@intel.com>
Subject: RE: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for= Secure Boot

 

Divneil,

Just want to double confirm: did you test the secure= boot and non-secure boot?

 

Thanks,

Ray

 

From: Wadhawan, Divneil R <divneil.r.wadhawan@intel.com>
Sent: Wednesday, September 16, 2020 11:53 PM
To: devel@edk2.groups.io=
Cc: Ni, Ray <ray.ni@intel.com= >; gaoliming <gaolimi= ng@byosoft.com.cn>; 'Andrew Fish' <afish@apple.com>; Justen, Jordan L <jordan.l.justen@intel.com>; Kinney, Michael D <michae= l.d.kinney@intel.com>; Wadhawan, Divneil R <divneil.r.wadhawan@intel.com>
Subject: [edk2-devel] [PATCH v2] EmulatorPkg: Enable support for Sec= ure Boot

 

SECURE_BOOT_ENABLE feature flag is introduced to ena= ble Secure Boot.

The following gets enabled with this patch:

o Secure Boot Menu in "Device Manager" for= enrolling keys

o Storage space for Authenticated Variables

o Authenticated execution of 3rd party images

 

Signed-off-by: Divneil Rai Wadhawan <divneil.r.wadhawan@intel.com>

---

EmulatorPkg/EmulatorPkg.dsc | 37 +++++++++++++++++++= ++++++++++++++++--

EmulatorPkg/EmulatorPkg.fdf | 14 ++++++++++++++=

2 files changed, 49 insertions(+), 2 deletions(-)

 

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorP= kg/EmulatorPkg.dsc

index 86a6271735..c6e25c745e 100644

--- a/EmulatorPkg/EmulatorPkg.dsc

+++ b/EmulatorPkg/EmulatorPkg.dsc

@@ -32,6 +32,7 @@

   DEFINE NETWORK_TLS_ENABLE  &n= bsp;    =3D FALSE

   DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FAL= SE

   DEFINE NETWORK_ISCSI_ENABLE  =    =3D FALSE

+  DEFINE SECURE_BOOT_ENABLE   &= nbsp;   =3D FALSE

 

 [SkuIds]

   0|DEFAULT

@@ -106,12 +107,20 @@

   LockBoxLib|MdeModulePkg/Library/LockBox= NullLib/LockBoxNullLib.inf

   CpuExceptionHandlerLib|MdeModulePkg/Lib= rary/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   TpmMeasurementLib|MdeModulePkg/Library/= TpmMeasurementLibNull/TpmMeasurementLibNull.inf

-  AuthVariableLib|MdeModulePkg/Library/AuthVar= iableLibNull/AuthVariableLibNull.inf

   VarCheckLib|MdeModulePkg/Library/VarChe= ckLib/VarCheckLib.inf

   SortLib|MdeModulePkg/Library/BaseSortLi= b/BaseSortLib.inf

   ShellLib|ShellPkg/Library/UefiShellLib/= UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHa= ndleLib/UefiFileHandleLib.inf

 

+!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE

+  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/= IntrinsicLib.inf

+  OpensslLib|CryptoPkg/Library/OpensslLib/Open= sslLibCrypto.inf

+  PlatformSecureLib|SecurityPkg/Library/Platfo= rmSecureLibNull/PlatformSecureLibNull.inf

+  AuthVariableLib|SecurityPkg/Library/AuthVari= ableLib/AuthVariableLib.inf

+!else

+  AuthVariableLib|MdeModulePkg/Library/AuthVar= iableLibNull/AuthVariableLibNull.inf

+!endif

+

[LibraryClasses.common.SEC]

   PeiServicesLib|EmulatorPkg/Library/SecP= eiServicesLib/SecPeiServicesLib.inf

   PcdLib|MdePkg/Library/BasePcdLibNull/Ba= sePcdLibNull.inf

@@ -162,6 +171,16 @@

   TimerLib|EmulatorPkg/Library/DxeCoreTim= erLib/DxeCoreTimerLib.inf

  EmuThunkLib|EmulatorPkg/Library/DxeEmuLi= b/DxeEmuLib.inf

 

+[LibraryClasses.common.DXE_DRIVER, LibraryClasses.c= ommon.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION]

+!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE

+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/= BaseCryptLib.inf

+!endif

+

+[LibraryClasses.common.DXE_RUNTIME_DRIVER]

+!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE

+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/= RuntimeCryptLib.inf

+!endif

+

[LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryCl= asses.common.UEFI_DRIVER, LibraryClasses.common.DXE_DRIVER, LibraryClasses.= common.UEFI_APPLICATION]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobL= ib.inf

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdL= ib.inf

@@ -190,6 +209,10 @@

   gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwa= reFdSize|0x002a0000

   gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwa= reBlockSize|0x10000

   gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwa= reVolume|L"../FV/FV_RECOVERY.fd"

+!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVar= iableSize|0x2800

+  gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysica= lPresence|TRUE

+!endif

 

   gEmulatorPkgTokenSpaceGuid.PcdEmuM= emorySize|L"64!64"

 

@@ -306,7 +329,14 @@

   EmulatorPkg/ResetRuntimeDxe/Reset.inf

   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe= .inf

   EmulatorPkg/FvbServicesRuntimeDxe/FvbSe= rvicesRuntimeDxe.inf

-  MdeModulePkg/Universal/SecurityStubDxe/Secur= ityStubDxe.inf

+

+  MdeModulePkg/Universal/SecurityStubDxe/Secur= ityStubDxe.inf {

+    <LibraryClasses>

+!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE

+      NULL|SecurityPkg/Lib= rary/DxeImageVerificationLib/DxeImageVerificationLib.inf

+!endif

+  }

+

   MdeModulePkg/Universal/EbcDxe/EbcDxe.in= f

   MdeModulePkg/Universal/MemoryTest/NullM= emoryTestDxe/NullMemoryTestDxe.inf

   EmulatorPkg/EmuThunkDxe/EmuThunk.inf

@@ -315,6 +345,9 @@

   EmulatorPkg/PlatformSmbiosDxe/PlatformS= mbiosDxe.inf

   EmulatorPkg/TimerDxe/Timer.inf

 

+!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE

+  SecurityPkg/VariableAuthenticated/SecureBoot= ConfigDxe/SecureBootConfigDxe.inf

+!endif

 

   MdeModulePkg/Universal/Variable/Ru= ntimeDxe/VariableRuntimeDxe.inf {

     <LibraryClasses>=

diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorP= kg/EmulatorPkg.fdf

index 295f6f1db8..b256aa9397 100644

--- a/EmulatorPkg/EmulatorPkg.fdf

+++ b/EmulatorPkg/EmulatorPkg.fdf

@@ -46,10 +46,17 @@ DATA =3D {

   # Blockmap[1]: End

   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0= 0, 0x00,

   ## This is the VARIABLE_STORE_HEADER

+!if $(SECURE_BOOT_ENABLE) =3D=3D FALSE

   #Signature: gEfiVariableGuid =3D

   #  { 0xddcf3616, 0x3275, 0x4164, {= 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}

   0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x6= 4, 0x41,

   0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xf= e, 0x7d,

+!else

+  # Signature: gEfiAuthenticatedVariableGuid = =3D

+  #  { 0xaaf32c78, 0x947b, 0x439a, { 0xa1= , 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}

+  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x= 43,

+  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x= 92,

+!endif

   #Size: 0xc000 (gEfiMdeModulePkgTokenSpa= ceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size of EFI_FIRMWARE_VOLUME_H= EADER) =3D 0xBFB8

   # This can speed up the Variable Dispat= ch a bit.

   0xB8, 0xBF, 0x00, 0x00,

@@ -186,6 +193,13 @@ INF  RuleOverride =3D UI M= deModulePkg/Application/UiApp/UiApp.inf

INF  MdeModulePkg/Application/BootManagerMenuAp= p/BootManagerMenuApp.inf

INF  MdeModulePkg/Universal/DriverSampleDxe/Dri= verSampleDxe.inf

 

+#

+# Secure Boot Key Enroll

+#

+!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE

+INF SecurityPkg/VariableAuthenticated/SecureBootCon= figDxe/SecureBootConfigDxe.inf

+!endif

+

#

# Network stack drivers

#

--

2.24.1.windows.2

--_000_BY5PR11MB40075EEF34052828B4C9BCB68C3F0BY5PR11MB4007namp_--