0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

patch 8.1.0606: 'cryptmethod' defaults to a very old method

Problem:    'cryptmethod' defaults to a very old method.
Solution:   Default to "blowfish2", it is now widely available.
This commit is contained in:
Bram Moolenaar
2018-12-16 18:20:00 +01:00
parent 6403bcdaf4
commit a86187b9cd
3 changed files with 6 additions and 4 deletions

View File

@@ -2370,7 +2370,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'cryptmethod'* *'cm'* *'cryptmethod'* *'cm'*
'cryptmethod' 'cm' string (default "zip") 'cryptmethod' 'cm' string (default "blowfish2")
global or local to buffer |global-local| global or local to buffer |global-local|
{not in Vi} {not in Vi}
Method used for encryption when the buffer is written to a file: 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|. modifications. Also see |:X|.
When setting the global value to an empty string, it will end up with 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 the value "blowfish2". When setting the local value to an empty
buffer will use the global value. string the buffer will use the global value.
When a new encryption method is added in a later version of Vim, and 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* . the current version does not recognize it, you will get *E821* .

View File

@@ -927,7 +927,7 @@ static struct vimoption options[] =
{"cryptmethod", "cm", P_STRING|P_ALLOCED|P_VI_DEF, {"cryptmethod", "cm", P_STRING|P_ALLOCED|P_VI_DEF,
#ifdef FEAT_CRYPT #ifdef FEAT_CRYPT
(char_u *)&p_cm, PV_CM, (char_u *)&p_cm, PV_CM,
{(char_u *)"zip", (char_u *)0L} {(char_u *)"blowfish2", (char_u *)0L}
#else #else
(char_u *)NULL, PV_NONE, (char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L} {(char_u *)0L, (char_u *)0L}

View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
606,
/**/ /**/
605, 605,
/**/ /**/