diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-16 18:20:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-16 18:20:00 +0100 |
| commit | a86187b9cd529754ad85cd621169876317eb3a69 (patch) | |
| tree | f8ed8bc8a666c1065a8aea6cf11a97531b658fe1 | |
| parent | 6403bcdaf4dc36c0445a539a37510534ef87ca24 (diff) | |
| download | vim-git-8.1.0606.tar.gz | |
patch 8.1.0606: 'cryptmethod' defaults to a very old methodv8.1.0606
Problem: 'cryptmethod' defaults to a very old method.
Solution: Default to "blowfish2", it is now widely available.
| -rw-r--r-- | runtime/doc/options.txt | 6 | ||||
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index b5278f16b..177a5699c 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2370,7 +2370,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'cryptmethod'* *'cm'* -'cryptmethod' 'cm' string (default "zip") +'cryptmethod' 'cm' string (default "blowfish2") global or local to buffer |global-local| {not in Vi} Method used for encryption when the buffer is written to a file: @@ -2401,8 +2401,8 @@ A jump table for the options with a short description can be found at |Q_op|. modifications. Also see |:X|. When setting the global value to an empty string, it will end up with - the value "zip". When setting the local value to an empty string the - buffer will use the global value. + the value "blowfish2". When setting the local value to an empty + string the buffer will use the global value. When a new encryption method is added in a later version of Vim, and the current version does not recognize it, you will get *E821* . diff --git a/src/option.c b/src/option.c index 192d292d5..f8e91e45c 100644 --- a/src/option.c +++ b/src/option.c @@ -927,7 +927,7 @@ static struct vimoption options[] = {"cryptmethod", "cm", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_CRYPT (char_u *)&p_cm, PV_CM, - {(char_u *)"zip", (char_u *)0L} + {(char_u *)"blowfish2", (char_u *)0L} #else (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} diff --git a/src/version.c b/src/version.c index 33694801a..069feb91f 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 606, +/**/ 605, /**/ 604, |