1
0
forked from aniani/vim

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

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

View File

@@ -1213,6 +1213,7 @@ retry:
* Read bytes from curbuf. Used for converting text read
* from stdin.
*/
eof = FALSE;
if (read_buf_lnum > from)
size = 0;
else
@@ -1261,6 +1262,7 @@ retry:
if (!curbuf->b_p_eol)
--tlen;
size = tlen;
eof = TRUE;
break;
}
}
@@ -1276,7 +1278,7 @@ retry:
// Let the crypt layer work with a buffer size of 8192
if (filesize == 0)
// set size to 8K + Sodium Crypt Metadata
size = WRITEBUFSIZE + 36
size = WRITEBUFSIZE + crypt_get_max_header_len()
+ crypto_secretstream_xchacha20poly1305_HEADERBYTES
+ crypto_secretstream_xchacha20poly1305_ABYTES;