Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi into next

[platform/kernel/u-boot.git] / common / hash.c

diff --git a/common/hash.c b/common/hash.c
index d0d825e..05238a8 100644 (file)
--- a/common/hash.c
+++ b/common/hash.c
@@ -13,21 +13,25 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <hw_sha.h>
+#include <asm/cache.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <u-boot/crc.h>
 #else
 #include "mkimage.h"
 #include <time.h>
-#include <image.h>
 #endif /* !USE_HOSTCC*/
 
 #include <hash.h>
+#include <image.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha1.h>
 #include <u-boot/sha256.h>
+#include <u-boot/sha512.h>
 #include <u-boot/md5.h>
 
 #if !defined(USE_HOSTCC) && defined(CONFIG_NEEDS_MANUAL_RELOC)
@@ -92,6 +96,63 @@ static int hash_finish_sha256(struct hash_algo *algo, void *ctx, void
 }
 #endif
 
+#if defined(CONFIG_SHA384)
+static int hash_init_sha384(struct hash_algo *algo, void **ctxp)
+{
+       sha512_context *ctx = malloc(sizeof(sha512_context));
+       sha384_starts(ctx);
+       *ctxp = ctx;
+       return 0;
+}
+
+static int hash_update_sha384(struct hash_algo *algo, void *ctx,
+                             const void *buf, unsigned int size, int is_last)
+{
+       sha384_update((sha512_context *)ctx, buf, size);
+       return 0;
+}
+
+static int hash_finish_sha384(struct hash_algo *algo, void *ctx, void
+                             *dest_buf, int size)
+{
+       if (size < algo->digest_size)
+               return -1;
+
+       sha384_finish((sha512_context *)ctx, dest_buf);
+       free(ctx);
+       return 0;
+}
+#endif
+
+#if defined(CONFIG_SHA512)
+static int hash_init_sha512(struct hash_algo *algo, void **ctxp)
+{
+       sha512_context *ctx = malloc(sizeof(sha512_context));
+       sha512_starts(ctx);
+       *ctxp = ctx;
+       return 0;
+}
+
+static int hash_update_sha512(struct hash_algo *algo, void *ctx,
+                             const void *buf, unsigned int size, int is_last)
+{
+       sha512_update((sha512_context *)ctx, buf, size);
+       return 0;
+}
+
+static int hash_finish_sha512(struct hash_algo *algo, void *ctx, void
+                             *dest_buf, int size)
+{
+       if (size < algo->digest_size)
+               return -1;
+
+       sha512_finish((sha512_context *)ctx, dest_buf);
+       free(ctx);
+       return 0;
+}
+#endif
+
+
 static int hash_init_crc16_ccitt(struct hash_algo *algo, void **ctxp)
 {
        uint16_t *ctx = malloc(sizeof(uint16_t));
@@ -193,6 +254,28 @@ static struct hash_algo hash_algo[] = {
 #endif
        },
 #endif
+#ifdef CONFIG_SHA384
+       {
+               .name           = "sha384",
+               .digest_size    = SHA384_SUM_LEN,
+               .chunk_size     = CHUNKSZ_SHA384,
+               .hash_func_ws   = sha384_csum_wd,
+               .hash_init      = hash_init_sha384,
+               .hash_update    = hash_update_sha384,
+               .hash_finish    = hash_finish_sha384,
+       },
+#endif
+#ifdef CONFIG_SHA512
+       {
+               .name           = "sha512",
+               .digest_size    = SHA512_SUM_LEN,
+               .chunk_size     = CHUNKSZ_SHA512,
+               .hash_func_ws   = sha512_csum_wd,
+               .hash_init      = hash_init_sha512,
+               .hash_update    = hash_update_sha512,
+               .hash_finish    = hash_finish_sha512,
+       },
+#endif
        {
                .name           = "crc16-ccitt",
                .digest_size    = 2,
@@ -215,7 +298,8 @@ static struct hash_algo hash_algo[] = {
 
 /* Try to minimize code size for boards that don't want much hashing */
 #if defined(CONFIG_SHA256) || defined(CONFIG_CMD_SHA1SUM) || \
-       defined(CONFIG_CRC32_VERIFY) || defined(CONFIG_CMD_HASH)
+       defined(CONFIG_CRC32_VERIFY) || defined(CONFIG_CMD_HASH) || \
+       defined(CONFIG_SHA384) || defined(CONFIG_SHA512)
 #define multi_hash()   1
 #else
 #define multi_hash()   0
@@ -442,8 +526,8 @@ static void hash_show(struct hash_algo *algo, ulong addr, ulong len, uint8_t *ou
                printf("%02x", output[i]);
 }
 
-int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
-                int argc, char * const argv[])
+int hash_command(const char *algo_name, int flags, struct cmd_tbl *cmdtp,
+                int flag, int argc, char *const argv[])
 {
        ulong addr, len;