vim: src/fileio.c comparison

comparison src/fileio.c @ 2239:732cb7b31956 vim73

Crypt the text in the undo file if the file itself is crypted.

author	Bram Moolenaar <bram@vim.org>
date	Sun, 30 May 2010 22:48:02 +0200
parents	3d0a7beb0d75
children	60da25e3aab7

comparison

equal deleted inserted replaced

-:3d0a7beb0d75
+:732cb7b31956
 * the ' parameter after opening a buffer. */
 curbuf->b_marks_read = TRUE;
 }
 #endif
-#ifdef FEAT_CRYPT
+#if defined(FEAT_CRYPT) || defined(PROTO)
 /*
 * Get the crypt method used for a file from "ptr[len]", the magic text at the
 * start of the file.
 * Returns -1 when no encryption used.
 */
 else if (newfile && *curbuf->b_p_key && !starting)
 	set_option_value((char_u *)"key", 0L, (char_u *)"", OPT_LOCAL);
 return cryptkey;
 }
-#endif
+/*
+* Check for magic number used for encryption.  Applies to the current buffer.
+* If found and decryption is possible returns OK;
+*/
+int
+prepare_crypt_read(fp)
+FILE	*fp;
+{
+int		method;
+char_u	buffer[CRYPT_MAGIC_LEN + CRYPT_SEED_LEN_MAX + 2];
+if (fread(buffer, CRYPT_MAGIC_LEN, 1, fp) != 1)
+	return FAIL;
+method = get_crypt_method((char *)buffer,
+					CRYPT_MAGIC_LEN + CRYPT_SEED_LEN_MAX);
+if (method < 0 || method != curbuf->b_p_cm)
+	return FAIL;
+if (method == 0)
+	crypt_init_keys(curbuf->b_p_key);
+else
+{
+	int seed_len = crypt_seed_len[method];
+	if (fread(buffer, seed_len, 1, fp) != 1)
+	    return FAIL;
+	bf_key_init(curbuf->b_p_key);
+	bf_ofb_init(buffer, seed_len);
+}
+return OK;
+}
+/*
+* Prepare for writing encrypted bytes for buffer "buf".
+* Returns a pointer to an allocated header of length "*lenp".
+*/
+char_u *
+prepare_crypt_write(buf, lenp)
+buf_T *buf;
+int   *lenp;
+{
+char_u  *header;
+int	    seed_len = crypt_seed_len[buf->b_p_cm];
+header = alloc_clear(CRYPT_MAGIC_LEN + CRYPT_SEED_LEN_MAX + 2);
+if (header != NULL)
+{
+	use_crypt_method = buf->b_p_cm;  /* select pkzip or blowfish */
+	vim_strncpy(header, (char_u *)crypt_magic[use_crypt_method],
+							     CRYPT_MAGIC_LEN);
+	if (buf->b_p_cm == 0)
+	    crypt_init_keys(buf->b_p_key);
+	else
+	{
+	    /* Using blowfish, add seed. */
+	    sha2_seed(header + CRYPT_MAGIC_LEN, seed_len); /* create iv */
+	    bf_ofb_init(header + CRYPT_MAGIC_LEN, seed_len);
+	    bf_key_init(buf->b_p_key);
+	}
+}
+*lenp = CRYPT_MAGIC_LEN + seed_len;
+return header;
+}
+/*
+* Like fwrite() but crypt the bytes when 'key' is set.
+* Returns 1 if successful.
+*/
+size_t
+fwrite_crypt(buf, ptr, len, fp)
+buf_T	*buf;
+char_u	*ptr;
+size_t	len;
+FILE	*fp;
+{
+char_u  *copy;
+char_u  small_buf[100];
+int	    ztemp, t;
+size_t  i;
+if (*buf->b_p_key == NUL)
+	return fwrite(ptr, len, (size_t)1, fp);
+if (len < 100)
+	copy = small_buf;  /* no malloc()/free() for short strings */
+else
+{
+	copy = lalloc(len, FALSE);
+	if (copy == NULL)
+	    return 0;
+}
+for (i = 0; i < len; ++i)
+{
+	ztemp = ptr[i];
+	copy[i] = ZENCODE(ztemp, t);
+}
+i = fwrite(copy, len, (size_t)1, fp);
+if (copy != small_buf)
+	vim_free(copy);
+return i;
+}
+/*
+* Read a string of length "len" from "fd".
+* When 'key' is set decrypt the bytes.
+*/
+char_u *
+read_string_decrypt(buf, fd, len)
+buf_T   *buf;
+FILE    *fd;
+int	    len;
+{
+char_u  *ptr;
+char_u  *p;
+ptr = read_string(fd, len);
+if (ptr != NULL || *buf->b_p_key != NUL)
+	for (p = ptr; p < ptr + len; ++p)
+	    ZDECODE(*p);
+return ptr;
+}
+#endif  /* FEAT_CRYPT */
 #ifdef UNIX
 static void
 set_file_time(fname, atime, mtime)
 char_u  *fname;
 write_info.bw_fd = fd;
 #ifdef FEAT_CRYPT
 if (*buf->b_p_key && !filtering)
 {
-	char_u header[CRYPT_MAGIC_LEN + CRYPT_SEED_LEN_MAX + 2];
+	char_u *header;
-	int seed_len = crypt_seed_len[buf->b_p_cm];
+	int    header_len;
-	use_crypt_method = buf->b_p_cm;  /* select pkzip or blowfish */
+	header = prepare_crypt_write(buf, &header_len);
+	if (header == NULL)
-	vim_memset(header, 0, sizeof(header));
+	    end = 0;
-	vim_strncpy(header, (char_u *)crypt_magic[use_crypt_method],
-							     CRYPT_MAGIC_LEN);
-	if (buf->b_p_cm == 0)
-	    crypt_init_keys(buf->b_p_key);
 	else
 	{
-	    /* Using blowfish, add seed. */
+	    /* Write magic number, so that Vim knows that this file is
-	    sha2_seed(header + CRYPT_MAGIC_LEN, seed_len); /* create iv */
+	     * encrypted when reading it again.  This also undergoes utf-8 to
-	    bf_ofb_init(header + CRYPT_MAGIC_LEN, seed_len);
+	     * ucs-2/4 conversion when needed. */
-	    bf_key_init(buf->b_p_key);
+	    write_info.bw_buf = header;
-	}
+	    write_info.bw_len = header_len;
+	    write_info.bw_flags = FIO_NOCONVERT;
-	/* Write magic number, so that Vim knows that this file is
+	    if (buf_write_bytes(&write_info) == FAIL)
-	 * encrypted when reading it again.  This also undergoes utf-8 to
+		end = 0;
-	 * ucs-2/4 conversion when needed. */
+	    wb_flags |= FIO_ENCRYPTED;
-	write_info.bw_buf = (char_u *)header;
+	    vim_free(header);
-	write_info.bw_len = CRYPT_MAGIC_LEN + seed_len;
+	}
-	write_info.bw_flags = FIO_NOCONVERT;
-	if (buf_write_bytes(&write_info) == FAIL)
-	    end = 0;
-	wb_flags |= FIO_ENCRYPTED;
 }
 #endif
 write_info.bw_buf = buffer;
 nchars = 0;
 {
 	int ztemp, t, i;
 	for (i = 0; i < len; i++)
 	{
-	    ztemp  = buf[i];
+	    ztemp = buf[i];
 	    buf[i] = ZENCODE(ztemp, t);
 	}
 }
 #endif

Mercurial > vim

comparison src/fileio.c @ 2239:732cb7b31956 vim73