diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-20 17:32:38 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-20 17:32:38 +0200 |
| commit | 49771f4fb03349d87e42c12305ebd5b307f3c2bd (patch) | |
| tree | 89eb7ec2a47e0e9582b45b7586c43b70fa53dc1b /src/memline.c | |
| parent | c7040a5615827cefe0edbdf7f69c6640fa1aa1e1 (diff) | |
Change 'cryptmethod' from a number to a string option. Make it global-local.
Diffstat (limited to 'src/memline.c')
| -rw-r--r-- | src/memline.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/memline.c b/src/memline.c index 0268087ab1..0f7b1d11c7 100644 --- a/src/memline.c +++ b/src/memline.c @@ -441,7 +441,7 @@ ml_set_b0_crypt(buf, b0p) b0p->b0_id[1] = BLOCK0_ID1; else { - if (buf->b_p_cm == 0) + if (get_crypt_method(buf) == 0) b0p->b0_id[1] = BLOCK0_ID1_C0; else { @@ -458,8 +458,8 @@ ml_set_b0_crypt(buf, b0p) * Will apply this to the swapfile. * "old_key" is the previous key. It is equal to buf->b_p_key when * 'cryptmethod' is changed. - * "old_cm" is the previous 'cryptmethod'. It is equal to buf->b_p_cm when - * 'key' is changed. + * "old_cm" is the previous 'cryptmethod'. It is equal to the current + * 'cryptmethod' when 'key' is changed. */ void ml_set_crypt_key(buf, old_key, old_cm) @@ -1250,12 +1250,13 @@ ml_recover() #ifdef FEAT_CRYPT if (b0p->b0_id[1] == BLOCK0_ID1_C0) - buf->b_p_cm = b0_cm = 0; + b0_cm = 0; else if (b0p->b0_id[1] == BLOCK0_ID1_C1) { - buf->b_p_cm = b0_cm = 1; + b0_cm = 1; mch_memmove(mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN); } + set_crypt_method(buf, b0_cm); #else if (b0p->b0_id[1] != BLOCK0_ID1) { @@ -4908,7 +4909,7 @@ ml_crypt_prepare(mfp, offset, reading) } else { - method = buf->b_p_cm; + method = get_crypt_method(buf); key = buf->b_p_key; seed = mfp->mf_seed; } |