scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-26 19:25:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboot: use vb2_safe_memcmp instead of SafeMemcmp

Browse Source 
No need to have two implementations of this now.

BUG=chromium:611535
BRANCH=none
TEST=make runtests; emerge-kevin coreboot depthcharge

Change-Id: I18bac928eb09971c37f3e1d7cbfd2009999b1f31
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/400899
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
This commit is contained in:
Randall Spangler
2016-10-14 10:41:44 -07:00
parent bf6263d529
commit 49e517d818
8 changed files with 50 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/lib/vboot_common.c
View File

@@ -197,7 +197,8 @@ int KeyBlockVerify(const VbKeyBlockHeader *block, uint64_t size,
VBDEBUG(("Not enough space for key block header.\n"));
return VBOOT_KEY_BLOCK_INVALID;
}
if (SafeMemcmp(block->magic, KEY_BLOCK_MAGIC, KEY_BLOCK_MAGIC_SIZE)) {
if (vb2_safe_memcmp(block->magic, KEY_BLOCK_MAGIC,
KEY_BLOCK_MAGIC_SIZE)) {
VBDEBUG(("Not a valid verified boot key block.\n"));
return VBOOT_KEY_BLOCK_INVALID;
}
@@ -249,8 +250,9 @@ int KeyBlockVerify(const VbKeyBlockHeader *block, uint64_t size,
header_checksum,
sizeof(header_checksum));
if (!rv)
rv = SafeMemcmp(header_checksum, GetSignatureDataC(sig),
sizeof(header_checksum));
rv = vb2_safe_memcmp(header_checksum,
GetSignatureDataC(sig),
sizeof(header_checksum));
if (rv) {
VBDEBUG(("Invalid key block hash.\n"));