Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 07:17:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

md5: Remove md5 non-watchdog API

Browse source 
We don't need an API specially for non-watchdog since md5_wd supports
it by disabling CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG.
Set 0x10000 as default chunk size for MD5.

Signed-off-by: Raymond Mao <raymond.mao@linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
Raymond Mao 2024-10-03 14:50:17 -07:00 • committed by Tom Rini
parent 5d1d98399f
commit 2b6f572958
5 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/friendlyarm/nanopi2/board.c
View file

@ -264,7 +264,8 @@ static void make_ether_addr(u8 *addr)
hash[6] = readl(PHY_BASEADDR_ECID + 0x08); hash[6] = readl(PHY_BASEADDR_ECID + 0x08);
hash[7] = readl(PHY_BASEADDR_ECID + 0x0c); hash[7] = readl(PHY_BASEADDR_ECID + 0x0c);
md5((unsigned char *)&hash[4], 64, (unsigned char *)hash); md5_wd((unsigned char *)&hash[4], 64, (unsigned char *)hash,
MD5_DEF_CHUNK_SZ);
hash[0] ^= hash[2]; hash[0] ^= hash[2];
hash[1] ^= hash[3]; hash[1] ^= hash[3];

3
board/intel/edison/edison.c
View file

@ -32,7 +32,8 @@ static void assign_serial(void)
if (!mmc) if (!mmc)
return; return;
md5((unsigned char *)mmc->cid, sizeof(mmc->cid), ssn); md5_wd((unsigned char *)mmc->cid, sizeof(mmc->cid), ssn,
MD5_DEF_CHUNK_SZ);
snprintf(usb0addr, sizeof(usb0addr), "02:00:86:%02x:%02x:%02x", snprintf(usb0addr, sizeof(usb0addr), "02:00:86:%02x:%02x:%02x",
ssn[13], ssn[14], ssn[15]); ssn[13], ssn[14], ssn[15]);

2
board/xilinx/zynq/bootimg.c
View file

@ -135,7 +135,7 @@ int zynq_validate_partition(u32 start_addr, u32 len, u32 chksum_off)
memcpy(&checksum[0], (u32 *)chksum_off, MD5_CHECKSUM_SIZE); memcpy(&checksum[0], (u32 *)chksum_off, MD5_CHECKSUM_SIZE);
md5_wd((u8 *)start_addr, len, &calchecksum[0], 0x10000); md5_wd((u8 *)start_addr, len, &calchecksum[0], MD5_DEF_CHUNK_SZ);
if (!memcmp(checksum, calchecksum, MD5_CHECKSUM_SIZE)) if (!memcmp(checksum, calchecksum, MD5_CHECKSUM_SIZE))
return 0; return 0;

7
include/u-boot/md5.h
View file

@ -12,6 +12,7 @@
#include "compiler.h" #include "compiler.h"
#define MD5_SUM_LEN 16 #define MD5_SUM_LEN 16
#define MD5_DEF_CHUNK_SZ 0x10000
#if defined(CONFIG_MBEDTLS_LIB_CRYPTO) #if defined(CONFIG_MBEDTLS_LIB_CRYPTO)
typedef mbedtls_md5_context MD5Context; typedef mbedtls_md5_context MD5Context;
@ -30,12 +31,6 @@ void MD5Init(MD5Context *ctx);
void MD5Update(MD5Context *ctx, unsigned char const *buf, unsigned int len); void MD5Update(MD5Context *ctx, unsigned char const *buf, unsigned int len);
void MD5Final(unsigned char digest[16], MD5Context *ctx); void MD5Final(unsigned char digest[16], MD5Context *ctx);
/*
* Calculate and store in 'output' the MD5 digest of 'len' bytes at
* 'input'. 'output' must have enough space to hold 16 bytes.
*/
void md5 (unsigned char *input, int len, unsigned char output[16]);
/* /*
* Calculate and store in 'output' the MD5 digest of 'len' bytes at 'input'. * Calculate and store in 'output' the MD5 digest of 'len' bytes at 'input'.
* 'output' must have enough space to hold 16 bytes. If 'chunk' Trigger the * 'output' must have enough space to hold 16 bytes. If 'chunk' Trigger the

14
lib/md5.c
View file

@ -262,20 +262,6 @@ MD5Transform(__u32 buf[4], __u32 const in[16])
buf[3] += d; buf[3] += d;
} }
/*
* Calculate and store in 'output' the MD5 digest of 'len' bytes at
* 'input'. 'output' must have enough space to hold 16 bytes.
*/
void
md5 (unsigned char *input, int len, unsigned char output[16])
{
MD5Context context;
MD5Init(&context);
MD5Update(&context, input, len);
MD5Final(output, &context);
}
/* /*
* Calculate and store in 'output' the MD5 digest of 'len' bytes at 'input'. * Calculate and store in 'output' the MD5 digest of 'len' bytes at 'input'.
* 'output' must have enough space to hold 16 bytes. If 'chunk' Trigger the * 'output' must have enough space to hold 16 bytes. If 'chunk' Trigger the