updated for version 7.4.172

Problem:    The blowfish code mentions output feedback, but the code is
            actually doing cipher feedback.
Solution:   Adjust names and comments.

diff --git a/src/blowfish.c b/src/blowfish.c
index 573a1da48be2dc3e5b3d06d040484bc5103bf58b..3d9ba5566a4b360ab9d216c24a0e17fd0b1afe7d 100644 (file)
--- a/src/blowfish.c
+++ b/src/blowfish.c
@@ -6,7 +6,7 @@
  * Do ":help credits" in Vim to see a list of people who contributed.
  * See README.txt for an overview of the Vim source code.
  *
- * Blowfish encryption for Vim; in Blowfish output feedback mode.
+ * Blowfish encryption for Vim; in Blowfish cipher feedback mode.
  * Contributed by Mohsin Ahmed, http://www.cs.albany.edu/~mosh
  * Based on http://www.schneier.com/blowfish.html by Bruce Schneier.
  */
@@ -19,7 +19,7 @@
 
 #define BF_BLOCK    8
 #define BF_BLOCK_MASK 7
-#define BF_OFB_LEN  (8*(BF_BLOCK))
+#define BF_CFB_LEN  (8*(BF_BLOCK))
 
 typedef union {
     UINT32_T ul[2];
@@ -554,42 +554,42 @@ bf_self_test()
     return err > 0 ? FAIL : OK;
 }
 
-/* Output feedback mode. */
+/* Cipher feedback mode. */
 static int randbyte_offset = 0;
 static int update_offset = 0;
-static char_u ofb_buffer[BF_OFB_LEN]; /* 64 bytes */
+static char_u cfb_buffer[BF_CFB_LEN]; /* 64 bytes */
 
 /*
  * Initialize with seed "iv[iv_len]".
  */
     void
-bf_ofb_init(iv, iv_len)
+bf_cfb_init(iv, iv_len)
     char_u *iv;
     int    iv_len;
 {
     int i, mi;
 
     randbyte_offset = update_offset = 0;
-    vim_memset(ofb_buffer, 0, BF_OFB_LEN);
+    vim_memset(cfb_buffer, 0, BF_CFB_LEN);
     if (iv_len > 0)
     {
-       mi = iv_len > BF_OFB_LEN ? iv_len : BF_OFB_LEN;
+       mi = iv_len > BF_CFB_LEN ? iv_len : BF_CFB_LEN;
        for (i = 0; i < mi; i++)
-           ofb_buffer[i % BF_OFB_LEN] ^= iv[i % iv_len];
+           cfb_buffer[i % BF_CFB_LEN] ^= iv[i % iv_len];
     }
 }
 
-#define BF_OFB_UPDATE(c) { \
-    ofb_buffer[update_offset] ^= (char_u)c; \
-    if (++update_offset == BF_OFB_LEN) \
+#define BF_CFB_UPDATE(c) { \
+    cfb_buffer[update_offset] ^= (char_u)c; \
+    if (++update_offset == BF_CFB_LEN) \
        update_offset = 0; \
 }
 
 #define BF_RANBYTE(t) { \
     if ((randbyte_offset & BF_BLOCK_MASK) == 0) \
-       bf_e_cblock(&ofb_buffer[randbyte_offset]); \
-    t = ofb_buffer[randbyte_offset]; \
-    if (++randbyte_offset == BF_OFB_LEN) \
+       bf_e_cblock(&cfb_buffer[randbyte_offset]); \
+    t = cfb_buffer[randbyte_offset]; \
+    if (++randbyte_offset == BF_CFB_LEN) \
        randbyte_offset = 0; \
 }
 
@@ -610,7 +610,7 @@ bf_crypt_encode(from, len, to)
     {
        ztemp = from[i];
        BF_RANBYTE(t);
-       BF_OFB_UPDATE(ztemp);
+       BF_CFB_UPDATE(ztemp);
        to[i] = t ^ ztemp;
     }
 }
@@ -630,7 +630,7 @@ bf_crypt_decode(ptr, len)
     {
        BF_RANBYTE(t);
        *p ^= t;
-       BF_OFB_UPDATE(*p);
+       BF_CFB_UPDATE(*p);
     }
 }
 
@@ -646,13 +646,13 @@ bf_crypt_init_keys(passwd)
 
     for (p = passwd; *p != NUL; ++p)
     {
-       BF_OFB_UPDATE(*p);
+       BF_CFB_UPDATE(*p);
     }
 }
 
 static int save_randbyte_offset;
 static int save_update_offset;
-static char_u save_ofb_buffer[BF_OFB_LEN];
+static char_u save_cfb_buffer[BF_CFB_LEN];
 static UINT32_T save_pax[18];
 static UINT32_T save_sbx[4][256];
 
@@ -665,7 +665,7 @@ bf_crypt_save()
 {
     save_randbyte_offset = randbyte_offset;
     save_update_offset = update_offset;
-    mch_memmove(save_ofb_buffer, ofb_buffer, BF_OFB_LEN);
+    mch_memmove(save_cfb_buffer, cfb_buffer, BF_CFB_LEN);
     mch_memmove(save_pax, pax, 4 * 18);
     mch_memmove(save_sbx, sbx, 4 * 4 * 256);
 }
@@ -679,7 +679,7 @@ bf_crypt_restore()
 {
     randbyte_offset = save_randbyte_offset;
     update_offset = save_update_offset;
-    mch_memmove(ofb_buffer, save_ofb_buffer, BF_OFB_LEN);
+    mch_memmove(cfb_buffer, save_cfb_buffer, BF_CFB_LEN);
     mch_memmove(pax, save_pax, 4 * 18);
     mch_memmove(sbx, save_sbx, 4 * 4 * 256);
 }

diff --git a/src/fileio.c b/src/fileio.c
index cb22bd31d48f1ae0cd3177bdd2452f1aebeca636..0c1ff62ab25ff835226026e2539b5e6f9022917d 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2973,7 +2973,7 @@ check_for_cryptkey(cryptkey, ptr, sizep, filesizep, newfile, fname, did_ask)
            else
            {
                bf_key_init(cryptkey, ptr + CRYPT_MAGIC_LEN, salt_len);
-               bf_ofb_init(ptr + CRYPT_MAGIC_LEN + salt_len, seed_len);
+               bf_cfb_init(ptr + CRYPT_MAGIC_LEN + salt_len, seed_len);
            }
 
            /* Remove magic number from the text */
@@ -3025,7 +3025,7 @@ prepare_crypt_read(fp)
        if (fread(buffer, salt_len + seed_len, 1, fp) != 1)
            return FAIL;
        bf_key_init(curbuf->b_p_key, buffer, salt_len);
-       bf_ofb_init(buffer + salt_len, seed_len);
+       bf_cfb_init(buffer + salt_len, seed_len);
     }
     return OK;
 }
@@ -3064,7 +3064,7 @@ prepare_crypt_write(buf, lenp)
            seed = salt + salt_len;
            sha2_seed(salt, salt_len, seed, seed_len);
            bf_key_init(buf->b_p_key, salt, salt_len);
-           bf_ofb_init(seed, seed_len);
+           bf_cfb_init(seed, seed_len);
        }
     }
     *lenp = CRYPT_MAGIC_LEN + salt_len + seed_len;

diff --git a/src/memline.c b/src/memline.c
index ea6571cb2d591428235f0ce91fdf1279841e451e..8f6c0e01e81eab1b627d14d6767abbef1731e203 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -4914,7 +4914,7 @@ ml_crypt_prepare(mfp, offset, reading)
         * block for the salt. */
        vim_snprintf((char *)salt, sizeof(salt), "%ld", (long)offset);
        bf_key_init(key, salt, (int)STRLEN(salt));
-       bf_ofb_init(seed, MF_SEED_LEN);
+       bf_cfb_init(seed, MF_SEED_LEN);
     }
 }
 

diff --git a/src/proto/blowfish.pro b/src/proto/blowfish.pro
index 51e4fa9ec5505c347c087f1a5cf30c0e02492c2d..4d64e10e804a65df7ade9d5662dad3a280f17cfb 100644 (file)
--- a/src/proto/blowfish.pro
+++ b/src/proto/blowfish.pro
@@ -1,6 +1,6 @@
 /* blowfish.c */
 void bf_key_init __ARGS((char_u *password, char_u *salt, int salt_len));
-void bf_ofb_init __ARGS((char_u *iv, int iv_len));
+void bf_cfb_init __ARGS((char_u *iv, int iv_len));
 void bf_crypt_encode __ARGS((char_u *from, size_t len, char_u *to));
 void bf_crypt_decode __ARGS((char_u *ptr, long len));
 void bf_crypt_init_keys __ARGS((char_u *passwd));

diff --git a/src/version.c b/src/version.c
index d384d84d0ac732e25603c066bc30d1782d2975f6..eadd03d1093e4ff0cabd6d4f34994834dafdf050 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    172,
 /**/
     171,
 /**/