From f87528d14d81780d5aea152ca507b35824bfaf0c Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sun, 20 Mar 2011 17:01:33 +1100 Subject: [PATCH] Forgot to include salt length for next head. --- lrzip.c | 5 ++++- stream.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lrzip.c b/lrzip.c index f9d06c6..fc67134 100644 --- a/lrzip.c +++ b/lrzip.c @@ -655,7 +655,10 @@ void decompress_file(rzip_control *control) print_output("Output filename is: %s: ", control->outfile); if (!expected_size) expected_size = control->st_size; - print_progress("[OK] - %lld bytes \n", expected_size); + if (!ENCRYPT) + print_progress("[OK] - %lld bytes \n", expected_size); + else + print_progress("[OK] \n"); if (unlikely(close(fd_hist) || close(fd_out))) fatal("Failed to close files\n"); diff --git a/stream.c b/stream.c index 4ade7a2..9ba5d41 100644 --- a/stream.c +++ b/stream.c @@ -1335,7 +1335,7 @@ retry: if (ENCRYPT) rewrite_encrypted(control, ctis, ctis->s[cti->streamno].last_head - 17); - ctis->s[cti->streamno].last_head = ctis->cur_pos + 1 + (write_len * 2); + ctis->s[cti->streamno].last_head = ctis->cur_pos + 1 + (write_len * 2) + (ENCRYPT ? SALT_LEN : 0); if (unlikely(seekto(control, ctis, ctis->cur_pos))) fatal("Failed to seekto cur_pos in compthread %d\n", i);