aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.979

Browse Source 
Problem:    When changing the crypt key the blocks read from disk are not
            decrypted.
Solution:   Also call ml_decrypt_data() when mf_old_key is set. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2015-12-19 15:28:18 +01:00
parent c42b9c670e
commit 4a8c2cfc56
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/memfile.c
View File

@@ -1032,8 +1032,9 @@ mf_read(mfp, hp)
} }
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT
/* Decrypt if 'key' is set and this is a data block. */ /* Decrypt if 'key' is set and this is a data block. And when changing the
if (*mfp->mf_buffer->b_p_key != NUL) * key. */
if (*mfp->mf_buffer->b_p_key != NUL || mfp->mf_old_key != NULL)
ml_decrypt_data(mfp, hp->bh_data, offset, size); ml_decrypt_data(mfp, hp->bh_data, offset, size);
#endif #endif

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
979,
/**/ /**/
978, 978,
/**/ /**/