diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-05-11 06:37:03 +0000 |
---|---|---|
committer | czhang46 <czhang46@Edk2> | 2015-05-11 06:37:03 +0000 |
commit | a16170a11026e8ebc93a279f30efd7fc0decb0d8 (patch) | |
tree | 13fbdde277b8ef75284c6f78367855227dd79b44 /SecurityPkg/VariableAuthenticated | |
parent | 2e04a2f99a03f5f5259aded7ae203bc826769988 (diff) | |
download | edk2-a16170a11026e8ebc93a279f30efd7fc0decb0d8.zip edk2-a16170a11026e8ebc93a279f30efd7fc0decb0d8.tar.gz edk2-a16170a11026e8ebc93a279f30efd7fc0decb0d8.tar.bz2 |
SecurityPkg: Update SecureBootConfigDxe to support ARM image
Update SecureBootConfigDxe component to allow the enrollment of
the digests of EFI executable that are built for ARM or AARCH64.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17406 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg/VariableAuthenticated')
-rw-r--r-- | SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c index 1d730dc..e43c6e0 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c @@ -1643,15 +1643,17 @@ LoadPeImage ( // Note the size of FileHeader field is constant for both IA32 and X64 arch
//
if ((NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_IA32)
- || (NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_EBC)) {
+ || (NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_EBC)
+ || (NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED)) {
//
- // IA-32 Architecture
+ // 32-bits Architecture
//
mImageType = ImageType_IA32;
mSecDataDir = (EFI_IMAGE_SECURITY_DATA_DIRECTORY*) &(NtHeader32->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_SECURITY]);
}
else if ((NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_IA64)
- || (NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_X64)) {
+ || (NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_X64)
+ || (NtHeader32->FileHeader.Machine == EFI_IMAGE_MACHINE_AARCH64)) {
//
// 64-bits Architecture
//
|