From f50a2533d0e1dfc4c402d44fc387e0efa41f0ec4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 21 May 2010 15:36:08 +0200 Subject: A few more changes for encryption. Add test that encrypted file can be read. --- runtime/doc/options.txt | 17 +++++++++++++---- runtime/doc/todo.txt | 10 ---------- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'runtime') diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c07549d07..3493a14bb 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2056,12 +2056,21 @@ A jump table for the options with a short description can be found at |Q_op|. Method used for encryption when the buffer is written to a file: *pkzip* 0 PkZip compatible method. A weak kind of encryption. - backwards compatible with Vim 7.2 and older. + Backwards compatible with Vim 7.2 and older. *blowfish* - 1 Blowfish method. Strong encryption. Not compatible - with Vim 7.2 and older. + 1 Blowfish method. Strong encryption. Requires Vim 7.3 + or later, files can NOT be read by Vim 7.2 and older. + This adds a "seed" to the file, every time you write + the file the encrypted bytes will be different. + When reading an encrypted file 'cryptmethod' will be set automatically - to detected method for the file being read. + to the detected method of the file being read. Thus if you write it + without changing 'cryptmethod' the same method will be used. + Changing 'cryptmethod' does not mark the file as modified, you have to + explicitly write it when not making modifications. + Also see |:X|. + 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* . *'cscopepathcomp'* *'cspc'* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index cd89dba7e..9987cafff 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -30,16 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Crypt update: -- Make sure test71 fails when blowfish test fails. -- When not full match with magic, check for head and give warning about - unsupported crypt method. -- if 'enc' is ucs-2, does utf-8 to ucs-2 encoding always work for seed? - -After patch 7.2.407 a backslash before a newline is turned into a NUL. (Andy -Wokula, 2010 May 18) -No longer possible to insert a line break? Roll back the patch? - "g8" doesn't produce right value on NUL. Patch (Dominique Pelle, 2010 May 18) Include cabal and obj syntax files. (Vincent Berthoux, 2010 May 16) -- cgit v1.2.1