Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[platform/kernel/u-boot.git] / lib_generic / md5.c

diff --git a/lib_generic/md5.c b/lib_generic/md5.c
index 3cee431..a9aae46 100644 (file)
--- a/lib_generic/md5.c
+++ b/lib_generic/md5.c
@@ -25,6 +25,12 @@
    and to fit the cifs vfs by
    Steve French sfrench@us.ibm.com */
 
+#ifndef USE_HOSTCC
+#include <common.h>
+#else
+#include <string.h>
+#endif /* USE_HOSTCC */
+#include <watchdog.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <u-boot/md5.h>
@@ -272,3 +278,39 @@ md5 (unsigned char *input, int len, unsigned char output[16])
        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
+ * watchdog every 'chunk_sz' bytes of input processed.
+ */
+void
+md5_wd (unsigned char *input, int len, unsigned char output[16],
+       unsigned int chunk_sz)
+{
+       struct MD5Context context;
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+       unsigned char *end, *curr;
+       int chunk;
+#endif
+
+       MD5Init(&context);
+
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+       curr = input;
+       end = input + len;
+       while (curr < end) {
+               chunk = end - curr;
+               if (chunk > chunk_sz)
+                       chunk = chunk_sz;
+               MD5Update(&context, curr, chunk);
+               curr += chunk;
+               WATCHDOG_RESET ();
+       }
+#else
+       MD5Update(&context, input, len);
+#endif
+
+       MD5Final(output, &context);
+}