[hackers] [sbase] crypt: Add some missing error checks for cryptsum || Michael Forney

From: <git_AT_suckless.org>
Date: Tue, 27 Dec 2016 15:04:03 +0100 (CET)

commit 52e49329e5c9a97f8bafceace6429e073a691b2e
Author: Michael Forney <mforney_AT_mforney.org>
AuthorDate: Tue Dec 6 02:16:53 2016 -0800
Commit: Laslo Hunhold <dev_AT_frign.de>
CommitDate: Tue Dec 27 14:02:32 2016 +0100

    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.

diff --git a/libutil/crypt.c b/libutil/crypt.c
index 3f849ba..6991c39 100644
--- a/libutil/crypt.c
+++ b/libutil/crypt.c
_AT_@ -64,7 +64,10 @@ mdchecklist(FILE *listfp, struct crypt_ops *ops, uint8_t *md, size_t sz,
                         (*noread)++;
                         continue;
                 }
- cryptsum(ops, fp, file, md);
+ if (cryptsum(ops, fp, file, md)) {
+ (*noread)++;
+ continue;
+ }
                 r = mdcheckline(line, md, sz);
                 if (r == 1) {
                         printf("%s: OK\n", file);
_AT_@ -125,8 +128,10 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
         int ret = 0;
 
         if (argc == 0) {
- cryptsum(ops, stdin, "<stdin>", md);
- mdprint(md, "<stdin>", sz);
+ if (cryptsum(ops, stdin, "<stdin>", md))
+ ret = 1;
+ else
+ mdprint(md, "<stdin>", sz);
         } else {
                 for (; *argv; argc--, argv++) {
                         if ((*argv)[0] == '-' && !(*argv)[1]) {
_AT_@ -137,11 +142,10 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
                                 ret = 1;
                                 continue;
                         }
- if (cryptsum(ops, fp, *argv, md)) {
+ if (cryptsum(ops, fp, *argv, md))
                                 ret = 1;
- } else {
+ else
                                 mdprint(md, *argv, sz);
- }
                         if (fp != stdin && fshut(fp, *argv))
                                 ret = 1;
                 }
Received on Tue Dec 27 2016 - 15:04:03 CET