summaryrefslogtreecommitdiffstats
path: root/patches/source/vim/patches/7.4.172
blob: 8ad9fca23409d88a5c723b02372532be8503f834 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
To: vim_dev@googlegroups.com
Subject: Patch 7.4.172
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.172
Problem:    The blowfish code mentions output feedback, but the code is
	    actually doing cipher feedback.
Solution:   Adjust names and comments.
Files:	    src/blowfish.c, src/fileio.c, src/proto/blowfish.pro,
	    src/memline.c


*** ../vim-7.4.171/src/blowfish.c	2010-12-17 19:58:18.000000000 +0100
--- src/blowfish.c	2014-02-11 15:18:12.882118804 +0100
***************
*** 6,12 ****
   * 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.
   * Contributed by Mohsin Ahmed, http://www.cs.albany.edu/~mosh
   * Based on http://www.schneier.com/blowfish.html by Bruce Schneier.
   */
--- 6,12 ----
   * 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 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,25 ****
  
  #define BF_BLOCK    8
  #define BF_BLOCK_MASK 7
! #define BF_OFB_LEN  (8*(BF_BLOCK))
  
  typedef union {
      UINT32_T ul[2];
--- 19,25 ----
  
  #define BF_BLOCK    8
  #define BF_BLOCK_MASK 7
! #define BF_CFB_LEN  (8*(BF_BLOCK))
  
  typedef union {
      UINT32_T ul[2];
***************
*** 554,595 ****
      return err > 0 ? FAIL : OK;
  }
  
! /* Output feedback mode. */
  static int randbyte_offset = 0;
  static int update_offset = 0;
! static char_u ofb_buffer[BF_OFB_LEN]; /* 64 bytes */
  
  /*
   * Initialize with seed "iv[iv_len]".
   */
      void
! bf_ofb_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);
      if (iv_len > 0)
      {
! 	mi = iv_len > BF_OFB_LEN ? iv_len : BF_OFB_LEN;
  	for (i = 0; i < mi; i++)
! 	    ofb_buffer[i % BF_OFB_LEN] ^= iv[i % iv_len];
      }
  }
  
! #define BF_OFB_UPDATE(c) { \
!     ofb_buffer[update_offset] ^= (char_u)c; \
!     if (++update_offset == BF_OFB_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) \
  	randbyte_offset = 0; \
  }
  
--- 554,595 ----
      return err > 0 ? FAIL : OK;
  }
  
! /* Cipher feedback mode. */
  static int randbyte_offset = 0;
  static int update_offset = 0;
! static char_u cfb_buffer[BF_CFB_LEN]; /* 64 bytes */
  
  /*
   * Initialize with seed "iv[iv_len]".
   */
      void
! bf_cfb_init(iv, iv_len)
      char_u *iv;
      int    iv_len;
  {
      int i, mi;
  
      randbyte_offset = update_offset = 0;
!     vim_memset(cfb_buffer, 0, BF_CFB_LEN);
      if (iv_len > 0)
      {
! 	mi = iv_len > BF_CFB_LEN ? iv_len : BF_CFB_LEN;
  	for (i = 0; i < mi; i++)
! 	    cfb_buffer[i % BF_CFB_LEN] ^= iv[i % iv_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(&cfb_buffer[randbyte_offset]); \
!     t = cfb_buffer[randbyte_offset]; \
!     if (++randbyte_offset == BF_CFB_LEN) \
  	randbyte_offset = 0; \
  }
  
***************
*** 610,616 ****
      {
  	ztemp = from[i];
  	BF_RANBYTE(t);
! 	BF_OFB_UPDATE(ztemp);
  	to[i] = t ^ ztemp;
      }
  }
--- 610,616 ----
      {
  	ztemp = from[i];
  	BF_RANBYTE(t);
! 	BF_CFB_UPDATE(ztemp);
  	to[i] = t ^ ztemp;
      }
  }
***************
*** 630,636 ****
      {
  	BF_RANBYTE(t);
  	*p ^= t;
! 	BF_OFB_UPDATE(*p);
      }
  }
  
--- 630,636 ----
      {
  	BF_RANBYTE(t);
  	*p ^= t;
! 	BF_CFB_UPDATE(*p);
      }
  }
  
***************
*** 646,658 ****
  
      for (p = passwd; *p != NUL; ++p)
      {
! 	BF_OFB_UPDATE(*p);
      }
  }
  
  static int save_randbyte_offset;
  static int save_update_offset;
! static char_u save_ofb_buffer[BF_OFB_LEN];
  static UINT32_T save_pax[18];
  static UINT32_T save_sbx[4][256];
  
--- 646,658 ----
  
      for (p = passwd; *p != NUL; ++p)
      {
! 	BF_CFB_UPDATE(*p);
      }
  }
  
  static int save_randbyte_offset;
  static int save_update_offset;
! static char_u save_cfb_buffer[BF_CFB_LEN];
  static UINT32_T save_pax[18];
  static UINT32_T save_sbx[4][256];
  
***************
*** 665,671 ****
  {
      save_randbyte_offset = randbyte_offset;
      save_update_offset = update_offset;
!     mch_memmove(save_ofb_buffer, ofb_buffer, BF_OFB_LEN);
      mch_memmove(save_pax, pax, 4 * 18);
      mch_memmove(save_sbx, sbx, 4 * 4 * 256);
  }
--- 665,671 ----
  {
      save_randbyte_offset = randbyte_offset;
      save_update_offset = update_offset;
!     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,685 ****
  {
      randbyte_offset = save_randbyte_offset;
      update_offset = save_update_offset;
!     mch_memmove(ofb_buffer, save_ofb_buffer, BF_OFB_LEN);
      mch_memmove(pax, save_pax, 4 * 18);
      mch_memmove(sbx, save_sbx, 4 * 4 * 256);
  }
--- 679,685 ----
  {
      randbyte_offset = save_randbyte_offset;
      update_offset = save_update_offset;
!     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);
  }
*** ../vim-7.4.171/src/fileio.c	2013-11-28 18:53:47.000000000 +0100
--- src/fileio.c	2014-02-11 15:16:57.546117649 +0100
***************
*** 2973,2979 ****
  	    else
  	    {
  		bf_key_init(cryptkey, ptr + CRYPT_MAGIC_LEN, salt_len);
! 		bf_ofb_init(ptr + CRYPT_MAGIC_LEN + salt_len, seed_len);
  	    }
  
  	    /* Remove magic number from the text */
--- 2973,2979 ----
  	    else
  	    {
  		bf_key_init(cryptkey, ptr + CRYPT_MAGIC_LEN, salt_len);
! 		bf_cfb_init(ptr + CRYPT_MAGIC_LEN + salt_len, seed_len);
  	    }
  
  	    /* Remove magic number from the text */
***************
*** 3025,3031 ****
  	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);
      }
      return OK;
  }
--- 3025,3031 ----
  	if (fread(buffer, salt_len + seed_len, 1, fp) != 1)
  	    return FAIL;
  	bf_key_init(curbuf->b_p_key, buffer, salt_len);
! 	bf_cfb_init(buffer + salt_len, seed_len);
      }
      return OK;
  }
***************
*** 3064,3070 ****
  	    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);
  	}
      }
      *lenp = CRYPT_MAGIC_LEN + salt_len + seed_len;
--- 3064,3070 ----
  	    seed = salt + salt_len;
  	    sha2_seed(salt, salt_len, seed, seed_len);
  	    bf_key_init(buf->b_p_key, salt, salt_len);
! 	    bf_cfb_init(seed, seed_len);
  	}
      }
      *lenp = CRYPT_MAGIC_LEN + salt_len + seed_len;
*** ../vim-7.4.171/src/proto/blowfish.pro	2013-08-10 13:37:06.000000000 +0200
--- src/proto/blowfish.pro	2014-02-11 15:18:20.382118919 +0100
***************
*** 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_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));
--- 1,6 ----
  /* blowfish.c */
  void bf_key_init __ARGS((char_u *password, char_u *salt, int salt_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));
*** ../vim-7.4.171/src/memline.c	2013-11-28 17:41:41.000000000 +0100
--- src/memline.c	2014-02-11 15:17:02.190117720 +0100
***************
*** 4914,4920 ****
  	 * 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);
      }
  }
  
--- 4914,4920 ----
  	 * block for the salt. */
  	vim_snprintf((char *)salt, sizeof(salt), "%ld", (long)offset);
  	bf_key_init(key, salt, (int)STRLEN(salt));
! 	bf_cfb_init(seed, MF_SEED_LEN);
      }
  }
  
*** ../vim-7.4.171/src/version.c	2014-02-11 15:10:38.138111836 +0100
--- src/version.c	2014-02-11 15:16:01.206116786 +0100
***************
*** 740,741 ****
--- 740,743 ----
  {   /* Add new patch number below this line */
+ /**/
+     172,
  /**/

-- 
GALAHAD: No look, really, this isn't nescess ...
PIGLET:  We must examine you.
GALAHAD: There's nothing wrong with ... that.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///