aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-16 23:24:03 -05:00
Code Activity

patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium

Browse Source 
Problem:    Build problems with MSVC, other crypt issues with libsodium.
Solution:   Adjust MSVC makefile. Disable swap file only when 'key' is set.
            Adjust error message used when key is wrong.  Fix Coverity issues.
            (Christian Brabandt, closes #8420, closes #8411)
This commit is contained in:
Christian Brabandt
2021-06-21 21:08:08 +02:00
committed by Bram Moolenaar
parent 22f17a29cd
commit 226b28b961
7 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/memline.c
View File

@@ -497,7 +497,8 @@ ml_set_crypt_key(
return; // no memfile yet, nothing to do
old_method = crypt_method_nr_from_name(old_cm);
if (old_method == CRYPT_M_SOD || crypt_get_method_nr(buf) == CRYPT_M_SOD)
// Swapfile encryption not supported by XChaCha20
if (crypt_get_method_nr(buf) == CRYPT_M_SOD && *buf->b_p_key != NUL)
{
// close the swapfile
mf_close_file(buf, TRUE);