Mercurial > vim
changeset 2717:f85fe1a05c2a v7.3.133
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.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 25 Feb 2011 16:52:17 +0100 |
| parents | 0b4a515b1254 |
| children | 31757405c0c5 |
| files | src/fileio.c src/version.c |
| diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -250,6 +250,7 @@ readfile(fname, sfname, from, lines_to_s #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 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