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.

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b5278f16ba429f08ceeac0f0b3629cae44caa18f..177a5699cb794dad9bfe384b01d759fae209dd1c 100644 (file)
--- 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 192d292d552acef02c2cfb15f1519b8174fb5daf..f8e91e45cdfb8cb7cf54d39c18a684acaabb6c5d 100644 (file)
--- 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 33694801abd8316c7d5427106c2f6117ed02c80a..069feb91fb034e6b0428ed56abf690743a3be193 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    606,
 /**/
     605,
 /**/