From 5afec9c781406a0aa3080c9aacb17c3f75abc0aa Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 25 Mar 2015 12:56:12 +0100 Subject: command: digest/hashsum: set key at command level and only set the key when specified Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- commands/digest.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'commands/digest.c') diff --git a/commands/digest.c b/commands/digest.c index b6bce88297..340c07a248 100644 --- a/commands/digest.c +++ b/commands/digest.c @@ -17,8 +17,7 @@ #include "internal.h" -int __do_digest(struct digest *d, unsigned char *key, int keylen, - unsigned char *sig, +int __do_digest(struct digest *d, unsigned char *sig, int argc, char *argv[]) { int ret = COMMAND_ERROR_USAGE; @@ -28,17 +27,6 @@ int __do_digest(struct digest *d, unsigned char *key, int keylen, if (argc < 1) goto err; - if (key) { - ret = digest_set_key(d, key, keylen); - if (ret) { - perror("set_key"); - goto err; - } - } else if (digest_is_flags(d, DIGEST_ALGO_NEED_KEY)) { - eprintf("%s need a key to be used\n", digest_name(d)); - goto err; - } - hash = calloc(digest_length(d), sizeof(unsigned char)); if (!hash) { perror("calloc"); @@ -147,10 +135,15 @@ static int do_digest(int argc, char *argv[]) } } - ret = digest_set_key(d, key, keylen); - free(tmp_key); - if (ret) + if (key) { + ret = digest_set_key(d, key, keylen); + free(tmp_key); + if (ret) + goto err; + } else if (digest_is_flags(d, DIGEST_ALGO_NEED_KEY)) { + eprintf("%s need a key to be used\n", digest_name(d)); goto err; + } if (sigfile) { sig = tmp_sig = read_file(sigfile, &siglen); @@ -178,7 +171,7 @@ static int do_digest(int argc, char *argv[]) } } - ret = __do_digest(d, NULL, 0, sig, argc, argv); + ret = __do_digest(d, sig, argc, argv); free(tmp_sig); return ret; -- cgit v1.2.3