mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-23 04:04:44 +08:00
6831415e39
Since commit348ea87850("cmd: hash: fix param count check") the hash command cannot be used without the optional variable name parameter if CONFIG_HASH_VERIFY=y. 'hash sha1 $loadaddr $filesize' returns CMD_RET_USAGE. The minimum number of arguments is four no matter if verification is enabled or not. Fixes:348ea87850("cmd: hash: fix param count check") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@gmail.com>
57 lines
1.2 KiB
C
57 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2012 The Chromium OS Authors.
|
|
*
|
|
* (C) Copyright 2011
|
|
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
|
|
*
|
|
* (C) Copyright 2000
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*/
|
|
|
|
#include <command.h>
|
|
#include <hash.h>
|
|
#include <linux/ctype.h>
|
|
|
|
#if IS_ENABLED(CONFIG_HASH_VERIFY)
|
|
#define HARGS 6
|
|
#else
|
|
#define HARGS 5
|
|
#endif
|
|
|
|
static int do_hash(struct cmd_tbl *cmdtp, int flag, int argc,
|
|
char *const argv[])
|
|
{
|
|
char *s;
|
|
int flags = HASH_FLAG_ENV;
|
|
|
|
if (argc < 4)
|
|
return CMD_RET_USAGE;
|
|
|
|
#if IS_ENABLED(CONFIG_HASH_VERIFY)
|
|
if (!strcmp(argv[1], "-v")) {
|
|
flags |= HASH_FLAG_VERIFY;
|
|
argc--;
|
|
argv++;
|
|
}
|
|
#endif
|
|
/* Move forward to 'algorithm' parameter */
|
|
argc--;
|
|
argv++;
|
|
for (s = *argv; *s; s++)
|
|
*s = tolower(*s);
|
|
return hash_command(*argv, flags, cmdtp, flag, argc - 1, argv + 1);
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
hash, HARGS, 1, do_hash,
|
|
"compute hash message digest",
|
|
"algorithm address count [[*]hash_dest]\n"
|
|
" - compute message digest [save to env var / *address]"
|
|
#if IS_ENABLED(CONFIG_HASH_VERIFY)
|
|
"\nhash -v algorithm address count [*]hash\n"
|
|
" - verify message digest of memory area to immediate value, \n"
|
|
" env var or *address"
|
|
#endif
|
|
);
|