tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Update modules to consume CalculateCrc32() 

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Liming Gao 2017-09-08 13:18:25 +08:00
parent 0a8e6f7971
commit 05542f4987
5 changed files with 11 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
MdeModulePkg/Core/RuntimeDxe/Crc32.c
View File

@ -7,7 +7,7 @@
EFI Runtime Services Table are converted from physical address to
virtual addresses. This requires that the 32-bit CRC be recomputed.
Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -20,8 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Uefi.h>
UINT32 mCrcTable[256];
#include <Library/BaseLib.h>
/**
Calculate CRC32 for target data.
@ -43,73 +42,6 @@ RuntimeDriverCalculateCrc32 (
OUT UINT32 *CrcOut
)
{
UINT32 Crc;
UINTN Index;
UINT8 *Ptr;
if (Data == NULL || DataSize == 0 || CrcOut == NULL) {
return EFI_INVALID_PARAMETER;
}
Crc = 0xffffffff;
for (Index = 0, Ptr = Data; Index < DataSize; Index++, Ptr++) {
Crc = (Crc >> 8) ^ mCrcTable[(UINT8) Crc ^ *Ptr];
}
*CrcOut = Crc ^ 0xffffffff;
*CrcOut = CalculateCrc32 (Data, DataSize);
return EFI_SUCCESS;
}
/**
This internal function reverses bits for 32bit data.
@param Value The data to be reversed.
@return Data reversed.
**/
UINT32
ReverseBits (
UINT32 Value
)
{
UINTN Index;
UINT32 NewValue;
NewValue = 0;
for (Index = 0; Index < 32; Index++) {
if ((Value & (1 << Index)) != 0) {
NewValue = NewValue | (1 << (31 - Index));
}
}
return NewValue;
}
/**
Initialize CRC32 table.
**/
VOID
RuntimeDriverInitializeCrc32Table (
VOID
)
{
UINTN TableEntry;
UINTN Index;
UINT32 Value;
for (TableEntry = 0; TableEntry < 256; TableEntry++) {
Value = ReverseBits ((UINT32) TableEntry);
for (Index = 0; Index < 8; Index++) {
if ((Value & 0x80000000) != 0) {
Value = (Value << 1) ^ 0x04c11db7;
} else {
Value = Value << 1;
}
}
mCrcTable[TableEntry] = ReverseBits (Value);
}
}

5
MdeModulePkg/Core/RuntimeDxe/Runtime.c
View File

@ -400,11 +400,6 @@ RuntimeDriverInitialize (
ASSERT_EFI_ERROR (Status);
mMyImageBase = MyLoadedImage->ImageBase;
//
// Initialize the table used to compute 32-bit CRCs
//
RuntimeDriverInitializeCrc32Table ();
//
// Fill in the entries of the EFI Boot Services and EFI Runtime Services Tables
//

9
MdeModulePkg/Core/RuntimeDxe/Runtime.h
View File

@ -103,15 +103,6 @@ RuntimeDriverSetVirtualAddressMap (
IN EFI_MEMORY_DESCRIPTOR *VirtualMap
);
/**
Initialize CRC32 table.
**/
VOID
RuntimeDriverInitializeCrc32Table (
VOID
);
/**
Install Runtime AP. This code includes the EfiRuntimeLib, but it only
functions at RT in physical mode.

108
MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
View File

@ -3,7 +3,7 @@
This library registers CRC32 guided section handler
to parse CRC32 encapsulation section and extract raw data.
Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <PiPei.h>
#include <Guid/Crc32GuidedSectionExtraction.h>
#include <Library/BaseLib.h>
#include <Library/ExtractGuidedSectionLib.h>
#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
@ -33,90 +34,6 @@ typedef struct {
UINT32 CRC32Checksum; ///< 32bit CRC check sum
} CRC32_SECTION2_HEADER;
/**
This internal function reverses bits for 32bit data.
@param Value The data to be reversed.
@return Data reversed.
**/
UINT32
PeiCrc32GuidedSectionExtractLibReverseBits (
UINT32 Value
)
{
UINTN Index;
UINT32 NewValue;
NewValue = 0;
for (Index = 0; Index < 32; Index++) {
if ((Value & (1 << Index)) != 0) {
NewValue = NewValue | (1 << (31 - Index));
}
}
return NewValue;
}
/**
Calculate CRC32 for target data.
@param Data The target data.
@param DataSize The target data size.
@param CrcOut The CRC32 for target data.
@retval EFI_SUCCESS The CRC32 for target data is calculated successfully.
@retval EFI_INVALID_PARAMETER Some parameter is not valid, so the CRC32 is not
calculated.
**/
EFI_STATUS
EFIAPI
PeiCrc32GuidedSectionExtractLibCalculateCrc32 (
IN VOID *Data,
IN UINTN DataSize,
OUT UINT32 *CrcOut
)
{
UINT32 CrcTable[256];
UINTN TableEntry;
UINTN Index;
UINT32 Value;
UINT32 Crc;
UINT8 *Ptr;
if (Data == NULL || DataSize == 0 || CrcOut == NULL) {
return EFI_INVALID_PARAMETER;
}
//
// Initialize CRC32 table.
//
for (TableEntry = 0; TableEntry < 256; TableEntry++) {
Value = PeiCrc32GuidedSectionExtractLibReverseBits ((UINT32) TableEntry);
for (Index = 0; Index < 8; Index++) {
if ((Value & 0x80000000) != 0) {
Value = (Value << 1) ^ 0x04c11db7;
} else {
Value = Value << 1;
}
}
CrcTable[TableEntry] = PeiCrc32GuidedSectionExtractLibReverseBits (Value);
}
//
// Compute CRC
//
Crc = 0xffffffff;
for (Index = 0, Ptr = Data; Index < DataSize; Index++, Ptr++) {
Crc = (Crc >> 8) ^ CrcTable[(UINT8) Crc ^ *Ptr];
}
*CrcOut = Crc ^ 0xffffffff;
return EFI_SUCCESS;
}
/**
GetInfo gets raw data size and attribute of the input guided section.
@ -203,7 +120,6 @@ Crc32GuidedSectionHandler (
OUT UINT32 *AuthenticationStatus
)
{
EFI_STATUS Status;
UINT32 SectionCrc32Checksum;
UINT32 Crc32Checksum;
UINT32 OutputBufferSize;
@ -254,27 +170,15 @@ Crc32GuidedSectionHandler (
*AuthenticationStatus = EFI_AUTH_STATUS_IMAGE_SIGNED;
}
//
// Init Checksum value to Zero.
//
Crc32Checksum = 0;
//
// Calculate CRC32 Checksum of Image
//
Status = PeiCrc32GuidedSectionExtractLibCalculateCrc32 (*OutputBuffer, OutputBufferSize, &Crc32Checksum);
if (Status == EFI_SUCCESS) {
if (Crc32Checksum != SectionCrc32Checksum) {
//
// If Crc32 checksum is not matched, AUTH tested failed bit is set.
//
*AuthenticationStatus |= EFI_AUTH_STATUS_TEST_FAILED;
}
} else {
Crc32Checksum = CalculateCrc32 (*OutputBuffer, OutputBufferSize);
if (Crc32Checksum != SectionCrc32Checksum) {
//
// If Crc32 checksum is not calculated, AUTH not tested bit is set.
// If Crc32 checksum is not matched, AUTH tested failed bit is set.
//
*AuthenticationStatus |= EFI_AUTH_STATUS_NOT_TESTED;
*AuthenticationStatus |= EFI_AUTH_STATUS_TEST_FAILED;
}
//

3
MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
View File

@ -5,7 +5,7 @@
# ExtractGuidedSectionLib service to register CRC32 guided section handler
# that parses CRC32 encapsulation section and extracts raw data.
#
# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@ -43,6 +43,7 @@
ExtractGuidedSectionLib
DebugLib
BaseMemoryLib
BaseLib
[Guids]
gEfiCrc32GuidedSectionExtractionGuid ## PRODUCES ## UNDEFINED