ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2026-04-18 12:43:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Centralise where all encryption/decryption is done, and whether to carry over the IV or not.

Browse source
This commit is contained in:
ckolivas 2011-03-17 14:10:58 +11:00
parent 9d496236c5
commit 4bc23ee001
5 changed files with 71 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

13
runzip.c
View file

@ -376,17 +376,8 @@ i64 runzip_fd(rzip_control *control, int fd_in, int fd_out, int fd_hist, i64 exp
if (unlikely(read_1g(control, fd_in, md5_stored, MD5_DIGEST_SIZE) != MD5_DIGEST_SIZE))
fatal("Failed to read md5 data in runzip_fd\n");
if (ENCRYPT) {
/* Even the MD5 value is stored encrypted */
uchar *dec_buf = malloc(MD5_DIGEST_SIZE);
if (unlikely(aes_crypt_cbc(&control->aes_ctx, AES_DECRYPT,
MD5_DIGEST_SIZE, control->hash_iv, md5_stored, dec_buf)))
failure("Failed to aes_crypt_cbc in runzip_fd\n");
for (i = 0; i < MD5_DIGEST_SIZE; i++)
md5_stored[i] = dec_buf[i];
free(dec_buf);
}
if (ENCRYPT)
lrz_crypt(control, md5_stored, MD5_DIGEST_SIZE, 0, 1);
for (i = 0; i < MD5_DIGEST_SIZE; i++)
if (md5_stored[i] != md5_resblock[i]) {
print_output("MD5 CHECK FAILED.\nStored:");