ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2026-01-01 22:29:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert the usecs field to a dedicated salt one which has 6 random bytes and 2 encoded loops bytes.

Browse source
This commit is contained in:
Con Kolivas 2011-03-15 13:14:27 +11:00
parent 0ffa041f36
commit 6a903eff8d
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lrzip.c
View file

@ -112,9 +112,13 @@ static char *make_magic(rzip_control *control)
if (unlikely(gettimeofday(&tv, NULL)))
fatal("Failed to gettimeofday in write_magic\n");
control->secs = tv.tv_sec;
control->usecs = tv.tv_usec;
/* The first 6 bytes of the salt is random data. The last 2 bytes
* encode how many times to hash the password */
get_rand(control->salt, 6);
control->encloops = nloops(control->secs, control->salt + 6, control->salt + 7);
memcpy(&magic[23], &control->secs, 8);
memcpy(&magic[31], &control->usecs, 8);
memcpy(&magic[31], &control->salt, 8);
return magic;
}
@ -187,7 +191,7 @@ static void get_magicver06(rzip_control *control, char *magic)
if (magic[22] == 1)
control->encrypt = 1;
memcpy(&control->secs, &magic[23], 8);
memcpy(&control->usecs, &magic[31], 8);
memcpy(&control->salt, &magic[31], 8);
print_maxverbose("Seconds %lld\n", control->secs);
}

2
lrzip_private.h
View file

@ -196,7 +196,7 @@ struct rzip_control {
uchar loop_byte1;
uchar loop_byte2;
i64 secs;
i64 usecs;
uchar salt[8];
unsigned char eof;
unsigned char magic_written;
md5_ctx ctx;