md5: Remove md5 non-watchdog API

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>

diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index b32dfc6b570ca32fec32e2c008c37e9be7c166c6..4dff32e10d6b7c0582ee0a0496b5b806b7e5f2c1 100644 (file)
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -264,7 +264,8 @@ static void make_ether_addr(u8 *addr)
        hash[6] = readl(PHY_BASEADDR_ECID + 0x08);
        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[1] ^= hash[3];

diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index 911ffda2fc7811c9ce798183d648fbadbff3ce37..27fda3fc1d2171e1afce9a889ba42aa730c47997 100644 (file)
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -32,7 +32,8 @@ static void assign_serial(void)
        if (!mmc)
                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",
                 ssn[13], ssn[14], ssn[15]);

diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c
index 79bec3a4cfbc8ddc73159bcdbaedcb20d1df353e..9eb0735f55d3ca9e5f22ac895aff3b2f856b1b5b 100644 (file)
--- a/board/xilinx/zynq/bootimg.c
+++ b/board/xilinx/zynq/bootimg.c
@@ -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);
 
-       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))
                return 0;

diff --git a/include/u-boot/md5.h b/include/u-boot/md5.h
index 69898fcbe4905e43d16c317b7caaa88df6c15347..c98b1a580882688988e4b39b252c1e2f6c36b2bb 100644 (file)
--- a/include/u-boot/md5.h
+++ b/include/u-boot/md5.h
@@ -12,6 +12,7 @@
 #include "compiler.h"
 
 #define MD5_SUM_LEN    16
+#define MD5_DEF_CHUNK_SZ 0x10000
 
 #if defined(CONFIG_MBEDTLS_LIB_CRYPTO)
 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 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'.
  * 'output' must have enough space to hold 16 bytes. If 'chunk' Trigger the

diff --git a/lib/md5.c b/lib/md5.c
index 584463d55cad38aa1db57be19c93615e2742c5ec..2d8977b2e85d78f4d6f9036ceccec79250bcc8c0 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -262,20 +262,6 @@ MD5Transform(__u32 buf[4], __u32 const in[16])
        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'.
  * 'output' must have enough space to hold 16 bytes. If 'chunk' Trigger the