updated for version 7.3.133

Problem:    When using encryption it's not clear what method was used.
Solution:   In the file message show "blowfish" when using blowfish.

diff --git a/src/fileio.c b/src/fileio.c
index a87b70b8bb687fd98bc9dda6552243eec56a6659..a0b75572af1fe67b916644139301d776681a10af 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -250,6 +250,7 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
 #ifdef FEAT_CRYPT
     char_u     *cryptkey = NULL;
     int                did_ask_for_key = FALSE;
+    int                crypt_method_used;
 #endif
 #ifdef FEAT_PERSISTENT_UNDO
     context_sha256_T sha_ctx;
@@ -2289,6 +2290,7 @@ failed:
        save_file_ff(curbuf);           /* remember the current file format */
 
 #ifdef FEAT_CRYPT
+    crypt_method_used = use_crypt_method;
     if (cryptkey != NULL)
     {
        crypt_pop_state();
@@ -2483,7 +2485,10 @@ failed:
 #ifdef FEAT_CRYPT
            if (cryptkey != NULL)
            {
-               STRCAT(IObuff, _("[crypted]"));
+               if (crypt_method_used == 1)
+                   STRCAT(IObuff, _("[blowfish]"));
+               else
+                   STRCAT(IObuff, _("[crypted]"));
                c = TRUE;
            }
 #endif
@@ -3199,6 +3204,9 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
     int                    write_undo_file = FALSE;
     context_sha256_T sha_ctx;
 #endif
+#ifdef FEAT_CRYPT
+    int                    crypt_method_used;
+#endif
 
     if (fname == NULL || *fname == NUL)        /* safety check */
        return FAIL;
@@ -4728,6 +4736,7 @@ restore_backup:
        mch_set_acl(wfname, acl);
 #endif
 #ifdef FEAT_CRYPT
+    crypt_method_used = use_crypt_method;
     if (wb_flags & FIO_ENCRYPTED)
        crypt_pop_state();
 #endif
@@ -4882,7 +4891,10 @@ restore_backup:
 #ifdef FEAT_CRYPT
        if (wb_flags & FIO_ENCRYPTED)
        {
-           STRCAT(IObuff, _("[crypted]"));
+           if (crypt_method_used == 1)
+               STRCAT(IObuff, _("[blowfish]"));
+           else
+               STRCAT(IObuff, _("[crypted]"));
            c = TRUE;
        }
 #endif

diff --git a/src/version.c b/src/version.c
index a61686082bff082d0a5d19f548d338889209159f..42be40af59356bf4eef674111557482562569f6c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    133,
 /**/
     132,
 /**/