projects
/
tfcrypt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Display hash of current defaults.
[tfcrypt.git]
/
tfc_skein.c
diff --git
a/tfc_skein.c
b/tfc_skein.c
index fe86c20de71b1c595aa15e5e2d489223d1766d71..e05927da18385375aa61ea314737b65e9f2890be 100644
(file)
--- a/
tfc_skein.c
+++ b/
tfc_skein.c
@@
-39,16
+39,6
@@
void skein(void *hash, size_t bits, const void *key, const void *data, size_t sz
skein_final(hash, &sk);
}
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 offset, tfc_fsize readto)
{
static tfc_byte skblk[TFC_BLKSIZE];
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];
@@
-68,7
+58,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 (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
+194,7
@@
_dothat:
while (1) {
memset(sksblk, 0, sizeof(sksblk));
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;
s = d = sksblk; t = NULL;
shash = fname = NULL;