aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-28 09:27:14 -04:00
Code Activity

patch 9.0.1481: decrypting with libsodium may fail if the library changes

Browse Source 
Problem:    Decrypting with libsodium may fail if the library changes.
Solution:   Add parameters used to the encrypted file header. (Christian
            Brabandt, closes #12279)
This commit is contained in:
Christian Brabandt
2023-04-23 17:50:22 +01:00
committed by Bram Moolenaar
parent dcd40cfca0
commit aae583441b
16 changed files with 422 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blowfish.c
View File

@@ -641,11 +641,8 @@ crypt_blowfish_decode(
int
crypt_blowfish_init(
cryptstate_T *state,
char_u* key,
char_u* salt,
int salt_len,
char_u* seed,
int seed_len)
char_u *key,
crypt_arg_T *arg)
{
bf_state_T *bfs = ALLOC_CLEAR_ONE(bf_state_T);
@@ -660,8 +657,8 @@ crypt_blowfish_init(
if (blowfish_self_test() == FAIL)
return FAIL;
bf_key_init(bfs, key, salt, salt_len);
bf_cfb_init(bfs, seed, seed_len);
bf_key_init(bfs, key, arg->cat_salt, arg->cat_salt_len);
bf_cfb_init(bfs, arg->cat_seed, arg->cat_seed_len);
return OK;
}