midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

crypt: Add some missing error checks for cryptsum 

Previously, if a file failed to read in a checksum list, it would be
reported as not matched rather than a read failure.

Also, if reading from stdin failed, previously a bogus checksum would be
printed anyway.
This commit is contained in:
Michael Forney 2016-12-06 02:16:53 -08:00 committed by Laslo Hunhold
parent 609169d600
commit 52e49329e5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libutil/crypt.c
View File

@ -64,7 +64,10 @@ mdchecklist(FILE *listfp, struct crypt_ops *ops, uint8_t *md, size_t sz,
(*noread)++; (*noread)++;
continue; continue;
} }
cryptsum(ops, fp, file, md); if (cryptsum(ops, fp, file, md)) {
(*noread)++;
continue;
}
r = mdcheckline(line, md, sz); r = mdcheckline(line, md, sz);
if (r == 1) { if (r == 1) {
printf("%s: OK\n", file); printf("%s: OK\n", file);
@ -125,8 +128,10 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
int ret = 0; int ret = 0;
if (argc == 0) { if (argc == 0) {
cryptsum(ops, stdin, "<stdin>", md); if (cryptsum(ops, stdin, "<stdin>", md))
mdprint(md, "<stdin>", sz); ret = 1;
else
mdprint(md, "<stdin>", sz);
} else { } else {
for (; *argv; argc--, argv++) { for (; *argv; argc--, argv++) {
if ((*argv)[0] == '-' && !(*argv)[1]) { if ((*argv)[0] == '-' && !(*argv)[1]) {
@ -137,11 +142,10 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
ret = 1; ret = 1;
continue; continue;
} }
if (cryptsum(ops, fp, *argv, md)) { if (cryptsum(ops, fp, *argv, md))
ret = 1; ret = 1;
} else { else
mdprint(md, *argv, sz); mdprint(md, *argv, sz);
}
if (fp != stdin && fshut(fp, *argv)) if (fp != stdin && fshut(fp, *argv))
ret = 1; ret = 1;
} }