updated for version 7.4.509

Problem:    Users are not aware their encryption is weak.
Solution:   Give a warning when prompting for the key.

diff --git a/src/crypt.c b/src/crypt.c
index c54e15c4afc2f8a5e13832c611215d60a40719f5..f25a2c4a9da083965f4106f951feec5dd3e8e068 100644 (file)
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -503,6 +503,26 @@ crypt_free_key(key)
     }
 }
 
+/*
+ * Check the crypt method and give a warning if it's outdated.
+ */
+    void
+crypt_check_method(method)
+    int method;
+{
+    if (method < CRYPT_M_BF2)
+    {
+       msg_scroll = TRUE;
+       MSG(_("Warning: Using a weak encryption method; see :help 'cm'"));
+    }
+}
+
+    void
+crypt_check_current_method()
+{
+    crypt_check_method(crypt_get_method_nr(curbuf));
+}
+
 /*
  * Ask the user for a crypt key.
  * When "store" is TRUE, the new key is stored in the 'key' option, and the

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 35e44f0f3c4a09f898e9cddd5dc5cc787eb93be6..e90a36ecc6976adbcd814b8b8dfaf12ed3645444 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -11524,6 +11524,7 @@ ex_match(eap)
 ex_X(eap)
     exarg_T    *eap UNUSED;
 {
+    crypt_check_current_method();
     (void)crypt_get_key(TRUE, TRUE);
 }
 #endif

diff --git a/src/fileio.c b/src/fileio.c
index 0843d042961432561d96089046a0fc0f5ff13b1b..a978ec241d2e9f80a4dba015b5f17a021aaec957 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2958,6 +2958,7 @@ check_for_cryptkey(cryptkey, ptr, sizep, filesizep, newfile, fname, did_ask)
                 * Happens when retrying to detect encoding. */
                smsg((char_u *)_(need_key_msg), fname);
                msg_scroll = TRUE;
+               crypt_check_method(method);
                cryptkey = crypt_get_key(newfile, FALSE);
                *did_ask = TRUE;
 

diff --git a/src/main.c b/src/main.c
index fe754958289fa68c0fd888cece0e9ff04bd863cd..1814385197b7da005bde3d83fbeda5cff86c5fd1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -854,6 +854,7 @@ vim_main2(int argc UNUSED, char **argv UNUSED)
 #ifdef FEAT_CRYPT
     if (params.ask_for_key)
     {
+       crypt_check_current_method();
        (void)crypt_get_key(TRUE, TRUE);
        TIME_MSG("getting crypt key");
     }

diff --git a/src/proto/crypt.pro b/src/proto/crypt.pro
index d61df718bd4d99e039f260e1b4788cdf1b1149f0..7b29026a1d0f34493ed12af9ab5b71750fc78292 100644 (file)
--- a/src/proto/crypt.pro
+++ b/src/proto/crypt.pro
@@ -19,6 +19,8 @@ void crypt_decode __ARGS((cryptstate_T *state, char_u *from, size_t len, char_u
 void crypt_encode_inplace __ARGS((cryptstate_T *state, char_u *buf, size_t len));
 void crypt_decode_inplace __ARGS((cryptstate_T *state, char_u *buf, size_t len));
 void crypt_free_key __ARGS((char_u *key));
+void crypt_check_method __ARGS((int method));
+void crypt_check_current_method __ARGS((void));
 char_u *crypt_get_key __ARGS((int store, int twice));
 void crypt_append_msg __ARGS((buf_T *buf));
 /* vim: set ft=c : */

diff --git a/src/version.c b/src/version.c
index 76ab14690d6e88b3fa8314c396526a4a79eb2aef..06c4016becbb5bc7f1cb52d18f4dfe86dd4d3117 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    509,
 /**/
     508,
 /**/