X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fhash.c;h=aceabc5caddb12d1c52d9b4c4028981ff01670b0;hb=f3b4bc458de3285a04c5f60df6372ad5ca79fa60;hp=12d67594abe0c6f912f5dcd80f5b0f4d1c3cd867;hpb=304f936aeaab0c3cc9d5af438fd3498ac7682991;p=oweals%2Fu-boot.git

diff --git a/common/hash.c b/common/hash.c
index 12d67594ab..aceabc5cad 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -256,7 +256,7 @@ static int parse_verify_sum(struct hash_algo *algo, char *verify_str,
 			env_var = 1;
 	}
 
-	if (env_var) {
+	if (!env_var) {
 		ulong addr;
 		void *buf;
 
@@ -347,7 +347,7 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
 {
 	ulong addr, len;
 
-	if (argc < 2)
+	if ((argc < 2) || ((flags & HASH_FLAG_VERIFY) && (argc < 3)))
 		return CMD_RET_USAGE;
 
 	addr = simple_strtoul(*argv++, NULL, 16);
@@ -380,8 +380,6 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
 #else
 		if (0) {
 #endif
-			if (!argc)
-				return CMD_RET_USAGE;
 			if (parse_verify_sum(algo, *argv, vsum,
 					flags & HASH_FLAG_ENV)) {
 				printf("ERROR: %s does not contain a valid "