skein_final(hash, &sk);
}
-void tf_key_tweak_compat(void *key)
-{
- TF_UNIT_TYPE *ukey = key, c = THREEFISH_CONST;
- size_t x;
-
- for (x = 0; x < TF_NR_BLOCK_UNITS; x++) c ^= ukey[x];
- ukey[x] = c;
- ukey[TF_TWEAK_WORD3] = ukey[TF_TWEAK_WORD1] ^ ukey[TF_TWEAK_WORD2];
-}
-
-tfc_yesno skeinfd(void *hash, size_t bits, const void *key, int fd, tfc_fsize readto)
+tfc_yesno skeinfd(void *hash, size_t bits, const void *key, int fd, tfc_fsize offset, tfc_fsize readto)
{
static tfc_byte skblk[TFC_BLKSIZE];
if (ctr_mode == TFC_MODE_SKSUM) total_processed_src = total_processed_dst = delta_processed = 0;
if (fd == -1) goto _fail;
- if (fd > 2 && readto == NOFSIZE) {
- readto = tfc_fdsize(fd);
- if (readto == NOFSIZE) goto _fail;
+ if (fd > 2) {
+ if (readto == NOFSIZE) {
+ readto = tfc_fdsize(fd);
+ if (readto == NOFSIZE) goto _fail;
+ }
+ if (offset != 0 && offset != NOFSIZE) {
+ if (lseek(fd, (off_t)offset, SEEK_SET) == -1) {
+ if (ignore_seek_errors == NO) goto _fail;
+ }
+ }
}
if (key) skein_init_key(&sk, key, bits);
pblk = skblk;
lblock = lrem = blk_len_adj(readto, total, TFC_BLKSIZE);
ldone = 0;
-_again: lio = read(fd, pblk, lrem);
+ if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(fd);
+_again: lio = xread(fd, pblk, lrem);
if (lio == 0) stop = YES;
if (lio != NOSIZE) ldone += lio;
else {
switch (error_action) {
case TFC_ERRACT_CONT: xerror(YES, NO, NO, "skeinfd: %d", fd); goto _again; break;
case TFC_ERRACT_SYNC:
+ case TFC_ERRACT_LSYNC:
xerror(YES, NO, NO, "skeinfd: %d", fd);
lio = lrem = ldone = lblock;
total += lio;
memset(skblk, 0, lio);
- lseek(fd, lio, SEEK_CUR);
+ if (rdpos == NOFSIZE) lseek(fd, lio, SEEK_CUR);
+ else lseek(fd, rdpos + lio, SEEK_SET);
break;
default: goto _fail; break;
}
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;
}
if (status_timer) setup_next_alarm(status_timer);
- if (skeinfd(hash, bits, mackey_opt ? mackey : NULL, fd, maxlen) != YES) {
+ if (skeinfd(hash, bits, mackey_opt ? mackey : NULL, fd, iseek, maxlen) != YES) {
xerror(YES, NO, YES, "%s", fname);
exitcode = 1;
continue;
}
_dohash: if (status_timer) setup_next_alarm(status_timer);
- if (skeinfd(hash, bits, mackey_opt ? mackey : NULL, fd, maxlen) != YES) {
+ if (skeinfd(hash, bits, mackey_opt ? mackey : NULL, fd, iseek, maxlen) != YES) {
xerror(YES, NO, YES, "%s", fargv[x]);
exitcode = 1;
continue;
for (y = 0; y < sksum_turns; y++) skein(hash, bits, mackey_opt ? mackey : NULL, hash, TF_FROM_BITS(bits));
}
if (do_outfmt == TFC_OUTFMT_B64) tfc_printbase64(stdout, hash, TF_FROM_BITS(bits), 0);
- else if (do_outfmt == TFC_OUTFMT_RAW) write(1, hash, TF_FROM_BITS(bits));
+ else if (do_outfmt == TFC_OUTFMT_RAW) xwrite(1, hash, TF_FROM_BITS(bits));
else mhexdump(hash, TF_FROM_BITS(bits), TF_FROM_BITS(bits), 0);
if (do_outfmt != TFC_OUTFMT_RAW) {
if (quiet == NO || xx > 1) tfc_say("\t%s", fargv[x] ? fargv[x] : "-");