diff options
| author | John Schmidt <john.schmidt.h@gmail.com> | 2014-05-07 18:04:54 +0200 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-05-20 08:31:06 -0300 |
| commit | 85338fe1d5a56f82546e16c305c2048c081771e0 (patch) | |
| tree | 1a14dcf2a4aa6c5276a4ea7802f4cbe576e9a6e3 /src/nvim/main.c | |
| parent | 32d018b57edbc75d6a70c5cd3e8012d7f924f460 (diff) | |
| download | rneovim-85338fe1d5a56f82546e16c305c2048c081771e0.tar.gz rneovim-85338fe1d5a56f82546e16c305c2048c081771e0.tar.bz2 rneovim-85338fe1d5a56f82546e16c305c2048c081771e0.zip | |
Remove cryptography
As discussed in #694, vim encryption uses old,
obsolete algorithms that are poorly implemented.
Since insecure cryptography is worse than no
cryptgraphy, the community voted in favor of
removing all crypto.
Various alternatives to the old crypto is
being discussed in #701.
Closes #694.
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 16a155fa20..8d7fbe0a02 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -12,7 +12,6 @@ #include "nvim/vim.h" #include "nvim/main.h" -#include "nvim/blowfish.h" #include "nvim/buffer.h" #include "nvim/charset.h" #include "nvim/diff.h" @@ -31,7 +30,6 @@ #include "nvim/message.h" #include "nvim/misc1.h" #include "nvim/misc2.h" -#include "nvim/crypt.h" #include "nvim/garray.h" #include "nvim/log.h" #include "nvim/memory.h" @@ -82,7 +80,6 @@ typedef struct { int want_full_screen; bool stdout_isatty; /* is stdout a terminal? */ char_u *term; /* specified terminal name */ - int ask_for_key; /* -x argument */ int no_swap_file; /* "-n" argument used */ int use_debug_break_level; int window_count; /* number of windows to use */ @@ -454,12 +451,6 @@ static char *(main_errors[]) = TIME_MSG("clearing screen"); } - if (params.ask_for_key) { - (void)blowfish_self_test(); - (void)get_crypt_key(TRUE, TRUE); - TIME_MSG("getting crypt key"); - } - no_wait_return = TRUE; /* @@ -1250,10 +1241,6 @@ static void command_line_scan(mparm_T *parmp) want_argument = TRUE; break; - case 'x': /* "-x" encrypted reading/writing of files */ - parmp->ask_for_key = TRUE; - break; - case 'X': /* "-X" don't connect to X server */ break; @@ -2250,7 +2237,6 @@ static void usage(void) main_msg(_("-s <scriptin>\tRead Normal mode commands from file <scriptin>")); main_msg(_("-w <scriptout>\tAppend all typed commands to file <scriptout>")); main_msg(_("-W <scriptout>\tWrite all typed commands to file <scriptout>")); - main_msg(_("-x\t\t\tEdit encrypted files")); #ifdef STARTUPTIME main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>")); #endif |