X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_skein.c;h=4eb6f92d7734695d45558f028f5613742974aaf5;hb=8b7f1839b1981554979af1aa2e5e8b58ad63fe77;hp=fe86c20de71b1c595aa15e5e2d489223d1766d71;hpb=a7a8ae5408eed270854e69adf40ccaf3a401f830;p=tfcrypt.git diff --git a/tfc_skein.c b/tfc_skein.c index fe86c20..4eb6f92 100644 --- a/tfc_skein.c +++ b/tfc_skein.c @@ -68,7 +68,9 @@ tfc_yesno skeinfd(void *hash, size_t bits, const void *key, int fd, tfc_fsize of if (readto == NOFSIZE) goto _fail; } if (offset != 0 && offset != NOFSIZE) { - if (lseek(fd, (off_t)offset, SEEK_SET) == -1) goto _fail; + if (lseek(fd, (off_t)offset, SEEK_SET) == -1) { + if (ignore_seek_errors == NO) goto _fail; + } } } @@ -202,8 +204,7 @@ _dothat: while (1) { memset(sksblk, 0, sizeof(sksblk)); - x = xfgets(sksblk, sizeof(sksblk), f); - if (x == 0) break; + if (xfgets(sksblk, sizeof(sksblk), f) != YES) break; s = d = sksblk; t = NULL; shash = fname = NULL;