ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2026-04-04 13:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Discard hash_iv entirely, using passphrase hash and centralise key generation.

Browse source 
Patch by Serge Belyshev.
This commit is contained in:
ckolivas 2011-03-18 10:22:58 +11:00
parent a3e80871c2
commit e856d481bf
7 changed files with 62 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

8
stream.c
View file

@ -66,7 +66,7 @@ static struct compress_thread{
pthread_mutex_t mutex; /* This thread's mutex */
struct stream_info *sinfo;
int streamno;
uchar salt[16];
uchar salt[BLOCKSALT_LEN];
} *cthread;
static struct uncomp_thread{
@ -1186,7 +1186,8 @@ retry:
if (!ret && ENCRYPT) {
get_rand(cti->salt, 8);
memcpy(cti->salt + 8, control->salt + 8, 8);
memcpy(cti->salt + 8, &cti->c_len, 8);
memcpy(cti->salt + 16, &cti->s_len, 8);
lrz_crypt(control, cti->s_buf, padded_len, cti->salt, 1);
}
@ -1435,7 +1436,8 @@ fill_another:
print_err("Failed to read_buf salt in fill_buffer\n");
return -1;
}
memcpy(salt + 8, control->salt + 8, 8);
memcpy(salt + 8, &c_len, 8);
memcpy(salt + 16, &u_len, 8);
}
padded_len = MAX(c_len, MIN_SIZE);