comparison src/proto/crypt.pro @ 24990:85d1e82ed134 v8.2.3032

patch 8.2.3032: build problems with MSVC, other crypt issues with libsodium Commit: https://github.com/vim/vim/commit/226b28b96150e59375d2bff44e0aadd382b0c3f1 Author: Christian Brabandt <cb@256bit.org> Date: Mon Jun 21 21:08:08 2021 +0200 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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 21 Jun 2021 21:15:04 +0200
parents 7e9e53a0368f
children e1cedf009920
comparison
equal deleted inserted replaced
24989:55f296521ca3 24990:85d1e82ed134
3 int crypt_method_nr_from_magic(char *ptr, int len); 3 int crypt_method_nr_from_magic(char *ptr, int len);
4 int crypt_works_inplace(cryptstate_T *state); 4 int crypt_works_inplace(cryptstate_T *state);
5 int crypt_get_method_nr(buf_T *buf); 5 int crypt_get_method_nr(buf_T *buf);
6 int crypt_whole_undofile(int method_nr); 6 int crypt_whole_undofile(int method_nr);
7 int crypt_get_header_len(int method_nr); 7 int crypt_get_header_len(int method_nr);
8 int crypt_get_max_header_len(void);
8 void crypt_set_cm_option(buf_T *buf, int method_nr); 9 void crypt_set_cm_option(buf_T *buf, int method_nr);
9 int crypt_self_test(void); 10 int crypt_self_test(void);
10 cryptstate_T *crypt_create(int method_nr, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len); 11 cryptstate_T *crypt_create(int method_nr, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len);
11 cryptstate_T *crypt_create_from_header(int method_nr, char_u *key, char_u *header); 12 cryptstate_T *crypt_create_from_header(int method_nr, char_u *key, char_u *header);
12 cryptstate_T *crypt_create_from_file(FILE *fp, char_u *key); 13 cryptstate_T *crypt_create_from_file(FILE *fp, char_u *key);
21 void crypt_check_method(int method); 22 void crypt_check_method(int method);
22 void crypt_check_current_method(void); 23 void crypt_check_current_method(void);
23 char_u *crypt_get_key(int store, int twice); 24 char_u *crypt_get_key(int store, int twice);
24 void crypt_append_msg(buf_T *buf); 25 void crypt_append_msg(buf_T *buf);
25 int crypt_sodium_init(cryptstate_T *state, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len); 26 int crypt_sodium_init(cryptstate_T *state, char_u *key, char_u *salt, int salt_len, char_u *seed, int seed_len);
26 void crypt_sodium_encode(cryptstate_T *state, char_u *from, size_t len, char_u *to, int last);
27 void crypt_sodium_decode(cryptstate_T *state, char_u *from, size_t len, char_u *to, int last);
28 long crypt_sodium_buffer_encode(cryptstate_T *state, char_u *from, size_t len, char_u **buf_out, int last); 27 long crypt_sodium_buffer_encode(cryptstate_T *state, char_u *from, size_t len, char_u **buf_out, int last);
29 long crypt_sodium_buffer_decode(cryptstate_T *state, char_u *from, size_t len, char_u **buf_out, int last); 28 long crypt_sodium_buffer_decode(cryptstate_T *state, char_u *from, size_t len, char_u **buf_out, int last);
30 /* vim: set ft=c : */ 29 /* vim: set ft=c : */