# HG changeset patch # User Bram Moolenaar # Date 1682433003 -7200 # Node ID 6761c71f4b2525f7c7560e53ba0b58c58e02f1b8 # Parent fcac9fad9e23cf8653ab2c6e32cc5b6e41fa9db4 patch 9.0.1488: xchacha20v2 crypt header is platform dependent Commit: https://github.com/vim/vim/commit/35a2ec18d6560251e8164636bac6e21ea504648e Author: ichizok Date: Tue Apr 25 15:27:27 2023 +0100 patch 9.0.1488: xchacha20v2 crypt header is platform dependent Problem: xchacha20v2 crypt header is platform dependent. Solution: Avoid using "size_t". (Ozaki Kiichi, closses https://github.com/vim/vim/issues/12296) diff --git a/src/crypt.c b/src/crypt.c --- a/src/crypt.c +++ b/src/crypt.c @@ -30,23 +30,22 @@ */ typedef struct { - char *name; // encryption name as used in 'cryptmethod' - char *magic; // magic bytes stored in file header - int salt_len; // length of salt, or 0 when not using salt - int seed_len; // length of seed, or 0 when not using seed - int add_len; // additional length in the header needed for storing - // custom data + char *name; // encryption name as used in 'cryptmethod' + char *magic; // magic bytes stored in file header + int salt_len; // length of salt, or 0 when not using salt + int seed_len; // length of seed, or 0 when not using seed + int add_len; // additional length in the header needed for storing + // custom data #ifdef CRYPT_NOT_INPLACE - int works_inplace; // encryption/decryption can be done in-place + int works_inplace; // encryption/decryption can be done in-place #endif - int whole_undofile; // whole undo file is encrypted + int whole_undofile; // whole undo file is encrypted // Optional function pointer for a self-test. - int (* self_test_fn)(void); + int (*self_test_fn)(void); // Function pointer for initializing encryption/decryption. - int (* init_fn)(cryptstate_T *state, char_u *key, - crypt_arg_T *arg); + int (* init_fn)(cryptstate_T *state, char_u *key, crypt_arg_T *arg); // Function pointers for encoding/decoding from one buffer into another. // Optional, however, these or the _buffer ones should be configured. @@ -79,7 +78,7 @@ static int crypt_sodium_init_(cryptstate static long crypt_sodium_buffer_decode(cryptstate_T *state, char_u *from, size_t len, char_u **buf_out, int last); static long crypt_sodium_buffer_encode(cryptstate_T *state, char_u *from, size_t len, char_u **buf_out, int last); #if defined(FEAT_EVAL) && defined(FEAT_SODIUM) -static void crypt_sodium_report_hash_params( unsigned long long opslimit, unsigned long long ops_def, size_t memlimit, size_t mem_def, int alg, int alg_def); +static void crypt_sodium_report_hash_params(unsigned long long opslimit, unsigned long long ops_def, size_t memlimit, size_t mem_def, int alg, int alg_def); #endif // index is method_nr of cryptstate_T, CRYPT_M_* @@ -916,7 +915,7 @@ crypt_sodium_init_( sodium_state_T *sd_state; int retval = 0; unsigned long long opslimit; - size_t memlimit; + unsigned long long memlimit; int alg; if (sodium_init() < 0) @@ -943,7 +942,7 @@ crypt_sodium_init_( // derive a key from the password if (crypto_pwhash(dkey, sizeof(dkey), (const char *)key, STRLEN(key), - arg->cat_salt, opslimit, memlimit, alg) != 0) + arg->cat_salt, opslimit, (size_t)memlimit, alg) != 0) { // out of memory sodium_free(sd_state); @@ -995,12 +994,12 @@ crypt_sodium_init_( #ifdef FEAT_EVAL crypt_sodium_report_hash_params(opslimit, crypto_pwhash_OPSLIMIT_INTERACTIVE, - memlimit, crypto_pwhash_MEMLIMIT_INTERACTIVE, + (size_t)memlimit, crypto_pwhash_MEMLIMIT_INTERACTIVE, alg, crypto_pwhash_ALG_DEFAULT); #endif if (crypto_pwhash(dkey, sizeof(dkey), (const char *)key, STRLEN(key), - arg->cat_salt, opslimit, memlimit, alg) != 0) + arg->cat_salt, opslimit, (size_t)memlimit, alg) != 0) { // out of memory sodium_free(sd_state); diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim --- a/src/testdir/test_crypt.vim +++ b/src/testdir/test_crypt.vim @@ -49,9 +49,11 @@ func Crypt_uncrypt(method) call assert_equal(a:method, &cryptmethod) split Xtest.txt - let text = ['01234567890123456789012345678901234567', - \ 'line 2 foo bar blah', - \ 'line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'] + let text =<< trim END + 01234567890123456789012345678901234567, + line 2 foo bar blah, + line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + END call setline(1, text) call feedkeys(":X\foobar\foobar\", 'xt') call assert_equal('*****', &key) @@ -134,15 +136,17 @@ endfunc func Test_uncrypt_xchacha20() CheckFeature sodium - let hex = ['00000000: 5669 6d43 7279 7074 7e30 3421 6b7d e607 vimCrypt~04!k}..', - \ '00000010: 4ea4 e99f 923e f67f 7b59 a80d 3bca 2f06 N....>..{Y..;./.', - \ '00000020: fa11 b951 8d09 0dc9 470f e7cf 8b90 4310 ...Q....G.....C.', - \ '00000030: 653b b83b e493 378b 0390 0e38 f912 626b e;.;..7....8..bk', - \ '00000040: a02e 4697 0254 2625 2d8e 3a0b 784b e89c ..F..T&%-.:.xK..', - \ '00000050: 0c67 a975 3c17 9319 8ffd 1463 7783 a1f3 .g.u<......cw...', - \ '00000060: d917 dcb3 8b3e ecd7 c7d4 086b 6059 7ead .....>.....k`Y~.', - \ '00000070: 9b07 f96b 5c1b 4d08 cd91 f208 5221 7484 ...k\.M.....R!t.', - \ '00000080: 72be 0136 84a1 d3 r..6...'] + let hex =<< trim END + 00000000: 5669 6d43 7279 7074 7e30 3421 6b7d e607 vimCrypt~04!k}.. + 00000010: 4ea4 e99f 923e f67f 7b59 a80d 3bca 2f06 N....>..{Y..;./. + 00000020: fa11 b951 8d09 0dc9 470f e7cf 8b90 4310 ...Q....G.....C. + 00000030: 653b b83b e493 378b 0390 0e38 f912 626b e;.;..7....8..bk + 00000040: a02e 4697 0254 2625 2d8e 3a0b 784b e89c ..F..T&%-.:.xK.. + 00000050: 0c67 a975 3c17 9319 8ffd 1463 7783 a1f3 .g.u<......cw... + 00000060: d917 dcb3 8b3e ecd7 c7d4 086b 6059 7ead .....>.....k`Y~. + 00000070: 9b07 f96b 5c1b 4d08 cd91 f208 5221 7484 ...k\.M.....R!t. + 00000080: 72be 0136 84a1 d3 r..6... + END " the file should be in latin1 encoding, this makes sure that readfile() " retries several times converting the multi-byte characters call Uncrypt_stable_xxd('xchacha20', hex, "sodium_crypt", ["abcdefghijklmnopqrstuvwxyzäöü", "ZZZ_äüöÄÜÖ_!@#$%^&*()_+=-`~"], 0) @@ -151,14 +155,16 @@ endfunc func Test_uncrypt_xchacha20v2_custom() CheckFeature sodium " Test, reading xchacha20v2 with custom encryption parameters - let hex = ['00000000: 5669 6d43 7279 7074 7e30 3521 934b f288 VimCrypt~05!.K..', - \ '00000010: 10ba 8bc9 25a0 8876 f85c f135 6fb8 518b ....%..v.\.5o.Q.', - \ '00000020: b133 9af1 0300 0000 0000 0000 0000 0010 .3..............', - \ '00000030: 0000 0000 0200 0000 b973 5f33 80e9 54fc .........s_3..T.', - \ '00000040: 138f ba3e 046b 3135 90b7 7783 5eac 7fe3 ...>.k15..w.^...', - \ '00000050: 0cd2 14df ed75 4b65 8763 8205 035c ec81 .....uKe.c...\..', - \ "00000060: a4cf 33d2 7507 ec38 ba62 a327 9068 d8ad ..3.u..8.b.'.h..", - \ '00000070: 2607 3fa6 f95d 7ea8 9799 f997 4820 0c &.?..]~.....H .'] + let hex =<< trim END + 00000000: 5669 6d43 7279 7074 7e30 3521 934b f288 VimCrypt~05!.K.. + 00000010: 10ba 8bc9 25a0 8876 f85c f135 6fb8 518b ....%..v.\.5o.Q. + 00000020: b133 9af1 0300 0000 0000 0000 0000 0010 .3.............. + 00000030: 0000 0000 0200 0000 b973 5f33 80e9 54fc .........s_3..T. + 00000040: 138f ba3e 046b 3135 90b7 7783 5eac 7fe3 ...>.k15..w.^... + 00000050: 0cd2 14df ed75 4b65 8763 8205 035c ec81 .....uKe.c...\.. + 00000060: a4cf 33d2 7507 ec38 ba62 a327 9068 d8ad ..3.u..8.b.'.h.. + 00000070: 2607 3fa6 f95d 7ea8 9799 f997 4820 0c &.?..]~.....H . + END call Uncrypt_stable_xxd('xchacha20v2', hex, "foobar", ["", "foo", "bar", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"], 1) call assert_match('xchacha20v2: using custom \w\+ "\d\+" for Key derivation.', execute(':messages')) endfunc @@ -166,18 +172,19 @@ endfunc func Test_uncrypt_xchacha20v2() CheckFeature sodium " Test, reading xchacha20v2 - let hex = [ - \ '00000000: 5669 6d43 7279 7074 7e30 3521 9f20 4e14 VimCrypt~05!. N.', - \ '00000010: c7da c1bd 7dea 8fbc db6c 38e6 7a77 6fef ....}....l8.zwo.', - \ '00000020: 82dd 964b 0300 0000 0000 0000 0000 0010 ...K............', - \ '00000030: 0000 0000 0200 0000 a97c 2f00 0b9d 19eb .........|/.....', - \ '00000040: 1d92 1ea5 3f22 c179 4b3e 870a eb19 6380 ....?".yK>....c.', - \ '00000050: 63f8 222d b5d1 3c73 7be5 d580 47ea 44cc c."-......c. + 00000050: 63f8 222d b5d1 3c73 7be5 d580 47ea 44cc c."-..