diff options
| author | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2021-09-03 03:54:20 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-08 23:11:46 +0300 |
| commit | fe54aeaa4acbb41880b05acef9ef949e62d299dd (patch) | |
| tree | 7530b6a5bf82364263c4fc06cef926cde5b97ca4 /common | |
| parent | 0721209699c5092b4d364c3b57256840d3a7dcbc (diff) | |
| download | u-boot-fe54aeaa4acbb41880b05acef9ef949e62d299dd.tar.xz | |
common: Move MD5 hash to hash_algo[] array.
MD5 is being called directly in some places, but it is not available
via hash_lookup_algo("md5"). This is inconsistent with other hasing
routines. To resolve this, add an "md5" entry to hash_algos[].
The #ifdef clause looks funnier than those for other entries. This is
because both MD5 and SPL_MD5 configs exist, whereas the other hashes
do not have "SPL_" entries. The long term plan is to get rid of the
ifdefs, so those should not be expected to survive much longer.
The md5 entry does not have .hash_init/update/finish members. That's
okay because hash_progressive_lookup_algo() will catch that, and
return -EPROTONOSUPPORT, while hash_lookup_algo() will return the
correct pointer.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[trini: Use CONFIG_IS_ENABLED not IS_ENABLED for MD5 check]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/hash.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/common/hash.c b/common/hash.c index dca23635ab..6277fe65b3 100644 --- a/common/hash.c +++ b/common/hash.c @@ -207,12 +207,25 @@ static int hash_finish_crc32(struct hash_algo *algo, void *ctx, void *dest_buf, return 0; } +#ifdef USE_HOSTCC +# define I_WANT_MD5 1 +#else +# define I_WANT_MD5 CONFIG_IS_ENABLED(MD5) +#endif /* * These are the hash algorithms we support. If we have hardware acceleration * is enable we will use that, otherwise a software version of the algorithm. * Note that algorithm names must be in lower case. */ static struct hash_algo hash_algo[] = { +#if I_WANT_MD5 + { + .name = "md5", + .digest_size = MD5_SUM_LEN, + .chunk_size = CHUNKSZ_MD5, + .hash_func_ws = md5_wd, + }, +#endif #ifdef CONFIG_SHA1 { .name = "sha1", |