[SCM] vim-scripts packaging branch, master, updated. v20091011-8-ga5571bf
James Vega
jamessan at debian.org
Fri Jan 29 03:30:52 UTC 2010
The following commit has been merged in the master branch:
commit a5571bfae98e5835887ed2cb62b05961aa0d440c
Author: James Vega <jamessan at debian.org>
Date: Thu Jan 28 22:25:22 2010 -0500
Update gnupg to 3026.
Closes: #496667
Signed-off-by: James Vega <jamessan at debian.org>
diff --git a/debian/changelog b/debian/changelog
index f7e12fa..7cea398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ vim-scripts (20091012) UNRELEASED; urgency=low
- vcscommand: Update to 1.99.35
- calendar: Update to 2.0
- bufexplorer: Update to 7.2.4
+ - gnupg: Update to 3026
+ + Fixes a bug when the user's shell is (t)csh and /bin/sh is dash.
+ (Closes: #496667)
-- James Vega <jamessan at debian.org> Sun, 24 Jan 2010 17:10:16 -0500
diff --git a/debian/vim-scripts.status b/debian/vim-scripts.status
index 412c341..1bbe0b6 100644
--- a/debian/vim-scripts.status
+++ b/debian/vim-scripts.status
@@ -69,7 +69,7 @@ author_url: http://www.vim.org/account/profile.php?user_id=1120
email: markus.braun at krawel.de
license: GNU GPL, see /usr/share/common-licenses/GPL
disabledby: let loaded_gnupg = 1
-version: 2782
+version: 3026
script_name: plugin/taglist.vim
addon: taglist
diff --git a/html/index.html b/html/index.html
index 23ebeb9..8631210 100644
--- a/html/index.html
+++ b/html/index.html
@@ -50,7 +50,7 @@
<li><a href="syntax_mkd.vim.html">syntax/mkd.vim.html</a></li>
</ul>
<p>
- Page generated on Tue, 26 Jan 2010 17:16:21 -0500
+ Page generated on Thu, 28 Jan 2010 22:23:03 -0500
.
</p>
</body>
diff --git a/html/plugin_gnupg.vim.html b/html/plugin_gnupg.vim.html
index ad08241..1eb6f76 100644
--- a/html/plugin_gnupg.vim.html
+++ b/html/plugin_gnupg.vim.html
@@ -166,8 +166,8 @@
<tr>
<td class="lightbg"><b> script karma </b></td>
<td>
- Rating <b>918/321</b>,
- Downloaded by 7050 </td>
+ Rating <b>1004/352</b>,
+ Downloaded by 7919 </td>
</tr>
</table>
<p>
@@ -183,7 +183,7 @@
<tr><td>This script implements transparent editing of gpg encrypted files. The filename must have a ".gpg", ".pgp" or ".asc" suffix. When opening such a file the content is decrypted, when opening a new file the script will ask for the recipients of the encrypted file. The file content will be encrypted to all recipients before it is written. The script turns off viminfo and swapfile to increase security.
<br>
<br>Commands:
<br>
<br> :GPGEditRecipients
<br> Opens a scratch buffer to change the list of recipients. Recipients that
<br> are unknown (not in your public key) are highlighted and have
<br> a prepended "!". Closing the buffer makes the changes permanent.
<br>
<br> :GPGViewRecipients
<br> Prints the list of recipients.
<br>
<br> :GPGEditOptions
<br> Opens a scratch buffer to change the options for encryption (symmetric,
<br> asymmetric, signing). Closing the buffer makes the changes permanent.
<br> WARNING: There is no check of the entered options, so you need to know
<br> what you are doing.
<br>
<br> :GPGViewOptions
<br> Prints the list of options.
<br>
<br>Variables:
<br>
<br> g:GPGExecutable
<br> If set used as gpg executable, otherwise the system chooses what is run
<br> when "gpg" is called. Defaults to "gpg".
<br>
<br> g:GPGUseAgent
<br> If set to 0 a possible available gpg-agent won't be used. Defaults to 1.
<br>
<br> g:GPGPreferSymmetric
<br> If set to 1 symmetric encryption is preferred for new files. Defaults to 0.
<br>
<br> g:GPGPreferArmor
<br> If set to 1 armored data is preferred for new files. Defaults to 0.
<br>
<br> g:GPGPreferSign
<br> If set to 1 signed data is preferred for new files. Defaults to 0.
<br>
<br> g:GPGDefaultRecipients
<br> If set, these recipients are used as defaults when no other recipient is
<br> defined. This variable is a Vim list. Default is unset.
<br>
<br>Known Issues:
<br>
<br> In some cases gvim can't decryt files
<br>
<br> This is caused by the fact that a running gvim has no TTY and thus gpg is
<br> not able to ask for the passphrase by itself. This is a problem for Windows
<br> and Linux versions of gvim and could not be solved unless a "terminal
<br> emulation" is implemented for gvim. To circumvent this you have to use any
<br> combination of gpg-agent and a graphical pinentry program:
<br>
<br> - gpg-agent only:
<br> you need to provide the passphrase for the needed key to gpg-agent
<br> in a terminal before you open files with gvim which require this key.
<br>
<br> - pinentry only:
<br> you will get a popup window every time you open a file that needs to
<br> be decrypted.
<br>
<br> - gpgagent and pinentry:
<br> you will get a popup window the first time you open a file that
<br> needs to be decrypted.
<br></td></tr>
<tr><td> </td></tr>
<tr><td class="prompt">install details</td></tr>
-<tr><td>Copy the gnupg.vim file to the $HOME/.vim/plugin directory. Refer to ':help add-plugin', ':help add-global-plugin' and ':help runtimepath' for more details about Vim plugins.
<br>
<br>From "man 1 gpg-agent":
<br>...
<br>You should always add the following lines to your .bashrc or whatever initialization file is used for all shell invocations:
<br>
<br> GPG_TTY=‘tty‘
<br> export GPG_TTY
<br>
<br>It is important that this environment variable always reflects the output of the tty command. For W32 systems this option is not required.
<br>...</td></tr>
+<tr><td>Copy the gnupg.vim file to the $HOME/.vim/plugin directory. Refer to ':help add-plugin', ':help add-global-plugin' and ':help runtimepath' for more details about Vim plugins.
<br>
<br>From "man 1 gpg-agent":
<br>...
<br>You should always add the following lines to your .bashrc or whatever initialization file is used for all shell invocations:
<br>
<br> GPG_TTY=`tty`
<br> export GPG_TTY
<br>
<br>It is important that this environment variable always reflects the output of the tty command. For W32 systems this option is not required.
<br>...
<br>
<br>Most distributions provide software to ease handling of gpg and gpg-agent. Examples are keychain or seahorse.
<br></td></tr>
<tr><td> </td></tr>
</table>
@@ -217,76 +217,84 @@ Click on the package to download.
<th valign="top">release notes</th>
</tr>
<tr>
- <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=10833">gnupg.vim</a></td>
- <td class="rowodd" valign="top" nowrap><b>2782</b></td>
- <td class="rowodd" valign="top" nowrap><i>2009-06-15</i></td>
+ <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=12200">gnupg.vim</a></td>
+ <td class="rowodd" valign="top" nowrap><b>3026</b></td>
+ <td class="rowodd" valign="top" nowrap><i>2010-01-27</i></td>
<td class="rowodd" valign="top" nowrap>7.0</td>
<td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="rowodd" valign="top" width="2000">- show more information (key id and creation time) of keys in GPGEditRecipients, GPGViewRecipients and during selecting in case of a ambiguous key.
<br></td>
+ <td class="rowodd" valign="top" width="2000">- fix a bug by using a sh compatible setting for 'shellredir' on unix systems. when 'shell' was set to csh or tcsh by the user and the system has /bin/sh linked to dash the plugin didn't work.
<br></td>
</tr>
<tr>
- <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=10683">gnupg.vim</a></td>
- <td class="roweven" valign="top" nowrap><b>2773</b></td>
- <td class="roweven" valign="top" nowrap><i>2009-05-27</i></td>
+ <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=10833">gnupg.vim</a></td>
+ <td class="roweven" valign="top" nowrap><b>2782</b></td>
+ <td class="roweven" valign="top" nowrap><i>2009-06-15</i></td>
<td class="roweven" valign="top" nowrap>7.0</td>
<td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="roweven" valign="top" width="2000">- fix a bug in detecting windows platforms
<br>- added g:GPGPreferSign to sign encrypted files by default (thanks to Tim Swast).
<br></td>
+ <td class="roweven" valign="top" width="2000">- show more information (key id and creation time) of keys in GPGEditRecipients, GPGViewRecipients and during selecting in case of a ambiguous key.
<br></td>
</tr>
<tr>
- <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=9142">gnupg.vim</a></td>
- <td class="rowodd" valign="top" nowrap><b>2276</b></td>
- <td class="rowodd" valign="top" nowrap><i>2008-08-18</i></td>
+ <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=10683">gnupg.vim</a></td>
+ <td class="rowodd" valign="top" nowrap><b>2773</b></td>
+ <td class="rowodd" valign="top" nowrap><i>2009-05-27</i></td>
<td class="rowodd" valign="top" nowrap>7.0</td>
<td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="rowodd" valign="top" width="2000">- added support for default recipients via the variable g:GPGDefaultRecipients.
<br>- fixed an wrong error message with symmetric encryption and set recipients (thanks to Sebastian Luettich).
<br>- create a empty new buffer on leaving vim to wipe out sensitive data on console.
<br>- make sure senisitive data is never written unencrypted to disk.</td>
+ <td class="rowodd" valign="top" width="2000">- fix a bug in detecting windows platforms
<br>- added g:GPGPreferSign to sign encrypted files by default (thanks to Tim Swast).
<br></td>
</tr>
<tr>
- <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=9058">gnupg.vim</a></td>
- <td class="roweven" valign="top" nowrap><b>2249</b></td>
- <td class="roweven" valign="top" nowrap><i>2008-07-31</i></td>
+ <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=9142">gnupg.vim</a></td>
+ <td class="roweven" valign="top" nowrap><b>2276</b></td>
+ <td class="roweven" valign="top" nowrap><i>2008-08-18</i></td>
<td class="roweven" valign="top" nowrap>7.0</td>
<td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="roweven" valign="top" width="2000">- rewritten lots of code to use lists feature of vim 7 instead of my own implementation
<br>- added a n option to change the name and location of GPG executable
<br>- try to get GPG_TTY dynamically.</td>
+ <td class="roweven" valign="top" width="2000">- added support for default recipients via the variable g:GPGDefaultRecipients.
<br>- fixed an wrong error message with symmetric encryption and set recipients (thanks to Sebastian Luettich).
<br>- create a empty new buffer on leaving vim to wipe out sensitive data on console.
<br>- make sure senisitive data is never written unencrypted to disk.</td>
</tr>
<tr>
- <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8174">gnupg.vim</a></td>
- <td class="rowodd" valign="top" nowrap><b>1933</b></td>
- <td class="rowodd" valign="top" nowrap><i>2008-01-23</i></td>
- <td class="rowodd" valign="top" nowrap>6.0</td>
+ <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=9058">gnupg.vim</a></td>
+ <td class="rowodd" valign="top" nowrap><b>2249</b></td>
+ <td class="rowodd" valign="top" nowrap><i>2008-07-31</i></td>
+ <td class="rowodd" valign="top" nowrap>7.0</td>
<td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="rowodd" valign="top" width="2000">- changed parsin to work with gpg2 correctly
<br>- save/restore view of saved window
<br>- fix a bug when encoding and fileencoding is different
<br>- restructured autocommand triggers
<br>- added a debug command and debug messages</td>
+ <td class="rowodd" valign="top" width="2000">- rewritten lots of code to use lists feature of vim 7 instead of my own implementation
<br>- added a n option to change the name and location of GPG executable
<br>- try to get GPG_TTY dynamically.</td>
</tr>
<tr>
- <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6949">gnupg.vim</a></td>
- <td class="roweven" valign="top" nowrap><b>1605</b></td>
- <td class="roweven" valign="top" nowrap><i>2007-04-05</i></td>
+ <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8174">gnupg.vim</a></td>
+ <td class="roweven" valign="top" nowrap><b>1933</b></td>
+ <td class="roweven" valign="top" nowrap><i>2008-01-23</i></td>
<td class="roweven" valign="top" nowrap>6.0</td>
<td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="roweven" valign="top" width="2000">- new plugin options to set preferences for symmetric/asymmetric and armor/binary files
<br>- fix for use with gvim. !! plugin works only in gvim if gpg-agent is available !!</td>
+ <td class="roweven" valign="top" width="2000">- changed parsin to work with gpg2 correctly
<br>- save/restore view of saved window
<br>- fix a bug when encoding and fileencoding is different
<br>- restructured autocommand triggers
<br>- added a debug command and debug messages</td>
</tr>
<tr>
- <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6518">gnupg.vim</a></td>
- <td class="rowodd" valign="top" nowrap><b>1472</b></td>
- <td class="rowodd" valign="top" nowrap><i>2006-12-15</i></td>
+ <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6949">gnupg.vim</a></td>
+ <td class="rowodd" valign="top" nowrap><b>1605</b></td>
+ <td class="rowodd" valign="top" nowrap><i>2007-04-05</i></td>
<td class="rowodd" valign="top" nowrap>6.0</td>
<td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="rowodd" valign="top" width="2000">- support for symmetric encrypted files.
<br>- detection of various encryption options.
<br>- possibility to change gpg options using new commands GPGEditOptions and GPGViewOptions commands.
<br>- support editing files with '.gpg', '.pgp' and '.asc' suffixes (tanks to Richard Bronosky).
<br>- detection of unencrypted files.
<br>- support for windows systems (thanks to Erik Remmelzwaal).</td>
+ <td class="rowodd" valign="top" width="2000">- new plugin options to set preferences for symmetric/asymmetric and armor/binary files
<br>- fix for use with gvim. !! plugin works only in gvim if gpg-agent is available !!</td>
</tr>
<tr>
- <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=2108">gnupg.vim</a></td>
- <td class="roweven" valign="top" nowrap><b>1.27</b></td>
- <td class="roweven" valign="top" nowrap><i>2003-06-24</i></td>
+ <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6518">gnupg.vim</a></td>
+ <td class="roweven" valign="top" nowrap><b>1472</b></td>
+ <td class="roweven" valign="top" nowrap><i>2006-12-15</i></td>
<td class="roweven" valign="top" nowrap>6.0</td>
<td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="roweven" valign="top" width="2000">updated documentation, that gnupg.vim only works for public/private-key encrypted files.</td>
+ <td class="roweven" valign="top" width="2000">- support for symmetric encrypted files.
<br>- detection of various encryption options.
<br>- possibility to change gpg options using new commands GPGEditOptions and GPGViewOptions commands.
<br>- support editing files with '.gpg', '.pgp' and '.asc' suffixes (tanks to Richard Bronosky).
<br>- detection of unencrypted files.
<br>- support for windows systems (thanks to Erik Remmelzwaal).</td>
</tr>
<tr>
- <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=2029">gnupg.vim</a></td>
- <td class="rowodd" valign="top" nowrap><b>1.26</b></td>
- <td class="rowodd" valign="top" nowrap><i>2003-05-30</i></td>
+ <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=2108">gnupg.vim</a></td>
+ <td class="rowodd" valign="top" nowrap><b>1.27</b></td>
+ <td class="rowodd" valign="top" nowrap><i>2003-06-24</i></td>
<td class="rowodd" valign="top" nowrap>6.0</td>
<td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
- <td class="rowodd" valign="top" width="2000">Initial upload</td>
+ <td class="rowodd" valign="top" width="2000">updated documentation, that gnupg.vim only works for public/private-key encrypted files.</td>
+</tr>
+<tr>
+ <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=2029">gnupg.vim</a></td>
+ <td class="roweven" valign="top" nowrap><b>1.26</b></td>
+ <td class="roweven" valign="top" nowrap><i>2003-05-30</i></td>
+ <td class="roweven" valign="top" nowrap>6.0</td>
+ <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=1120">Markus Braun</a></i></td>
+ <td class="roweven" valign="top" width="2000">Initial upload</td>
</tr>
</table>
<!-- finish off the framework -->
diff --git a/plugin/gnupg.vim b/plugin/gnupg.vim
index fdcac93..09116d6 100644
--- a/plugin/gnupg.vim
+++ b/plugin/gnupg.vim
@@ -1,12 +1,14 @@
-" Name: gnupg.vim
-" Version: $Id: gnupg.vim 2782 2009-06-08 12:32:13Z mbr $
-" Author: Markus Braun <markus.braun at krawel.de>
-" Summary: Vim plugin for transparent editing of gpg encrypted files.
-" Licence: This program is free software; you can redistribute it and/or
-" modify it under the terms of the GNU General Public License.
-" See http://www.gnu.org/copyleft/gpl.txt
+" Name: gnupg.vim
+" Version: $Id: gnupg.vim 3026 2010-01-27 08:18:04Z mbr $
+" Author: Markus Braun <markus.braun at krawel.de>
+" Summary: Vim plugin for transparent editing of gpg encrypted files.
+" Licence: This program is free software; you can redistribute it and/or
+" modify it under the terms of the GNU General Public License.
+" See http://www.gnu.org/copyleft/gpl.txt
+"
" Section: Documentation {{{1
-" Description:
+"
+" Description: {{{2
"
" This script implements transparent editing of gpg encrypted files. The
" filename must have a ".gpg", ".pgp" or ".asc" suffix. When opening such
@@ -15,7 +17,7 @@
" encrypted to all recipients before it is written. The script turns off
" viminfo and swapfile to increase security.
"
-" Installation:
+" Installation: {{{2
"
" Copy the gnupg.vim file to the $HOME/.vim/plugin directory.
" Refer to ':help add-plugin', ':help add-global-plugin' and ':help
@@ -34,7 +36,10 @@
" put of the tty command. For W32 systems this option is not required.
" ...
"
-" Commands:
+" Most distributions provide software to ease handling of gpg and gpg-agent.
+" Examples are keychain or seahorse.
+"
+" Commands: {{{2
"
" :GPGEditRecipients
" Opens a scratch buffer to change the list of recipients. Recipients that
@@ -53,7 +58,7 @@
" :GPGViewOptions
" Prints the list of options.
"
-" Variables:
+" Variables: {{{2
"
" g:GPGExecutable
" If set used as gpg executable, otherwise the system chooses what is run
@@ -75,7 +80,7 @@
" If set, these recipients are used as defaults when no other recipient is
" defined. This variable is a Vim list. Default is unset.
"
-" Known Issues:
+" Known Issues: {{{2
"
" In some cases gvim can't decryt files
@@ -97,7 +102,7 @@
" you will get a popup window the first time you open a file that
" needs to be decrypted.
"
-" Credits:
+" Credits: {{{2
"
" - Mathieu Clabaut for inspirations through his vimspell.vim script.
" - Richard Bronosky for patch to enable ".pgp" suffix.
@@ -113,18 +118,21 @@
" - Tim Swast for patch to generate signed files
"
" Section: Plugin header {{{1
-if (v:version < 700)
- echohl ErrorMsg | echo 'plugin gnupg.vim requires Vim version >= 7.0' | echohl None
- finish
-endif
+" guard against multiple loads {{{2
if (exists("g:loaded_gnupg") || &cp || exists("#BufReadPre#*.\(gpg\|asc\|pgp\)"))
finish
endif
+let g:loaded_gnupg = "$Revision: 3026 $"
-let g:loaded_gnupg = "$Revision: 2782 $"
+" check for correct vim version {{{2
+if (v:version < 700)
+ echohl ErrorMsg | echo 'plugin gnupg.vim requires Vim version >= 7.0' | echohl None
+ finish
+endif
" Section: Autocmd setup {{{1
+
augroup GnuPG
autocmd!
@@ -147,19 +155,24 @@ augroup GnuPG
augroup END
" Section: Constants {{{1
+
let s:GPGMagicString = "\t \t"
" Section: Highlight setup {{{1
+
highlight default link GPGWarning WarningMsg
highlight default link GPGError ErrorMsg
highlight default link GPGHighlightUnknownRecipient ErrorMsg
" Section: Functions {{{1
+
" Function: s:GPGInit() {{{2
"
" initialize the plugin
"
function s:GPGInit()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGInit()")
+
" first make sure nothing is written to ~/.viminfo while editing
" an encrypted file.
set viminfo=
@@ -192,16 +205,11 @@ function s:GPGInit()
let g:GPGPreferSign = 0
endif
- " check if debugging is turned on
+ " start with empty default recipients if none is defined so far
if (!exists("g:GPGDefaultRecipients"))
let g:GPGDefaultRecipients = []
endif
- " check if debugging is turned on
- if (!exists("g:GPGDebugLevel"))
- let g:GPGDebugLevel = 0
- endif
-
" print version
call s:GPGDebug(1, "gnupg.vim ". g:loaded_gnupg)
@@ -234,8 +242,8 @@ function s:GPGInit()
let s:shellsave = &shell
if (has("unix"))
" unix specific settings
- let s:shellredir = &shellredir
- let s:shell = 'sh'
+ let s:shellredir = ">%s 2>&1"
+ let s:shell = '/bin/sh'
let s:stderrredirnull = '2>/dev/null'
let s:GPGCommand = "LANG=C LC_ALL=C " . s:GPGCommand
else
@@ -245,17 +253,37 @@ function s:GPGInit()
let s:stderrredirnull = '2>nul'
endif
+ call s:GPGDebug(3, "shellredirsave: " . s:shellredirsave)
+ call s:GPGDebug(3, "shellsave: " . s:shellsave)
+
+ call s:GPGDebug(3, "shell: " . s:shell)
+ call s:GPGDebug(3, "shellcmdflag: " . &shellcmdflag)
+ call s:GPGDebug(3, "shellxquote: " . &shellxquote)
+ call s:GPGDebug(3, "shellredir: " . s:shellredir)
+ call s:GPGDebug(3, "stderrredirnull: " . s:stderrredirnull)
+
+ call s:GPGDebug(3, "shell implementation: " . resolve(s:shell))
+
" find the supported algorithms
+ let commandline = s:GPGCommand . " --version"
+ call s:GPGDebug(2, "command: ". commandline)
let &shellredir = s:shellredir
let &shell = s:shell
- let output = system(s:GPGCommand . " --version")
+ let output = system(commandline)
let &shellredir = s:shellredirsave
let &shell = s:shellsave
+ call s:GPGDebug(2, "output: ". output)
let s:GPGPubkey = substitute(output, ".*Pubkey: \\(.\\{-}\\)\n.*", "\\1", "")
let s:GPGCipher = substitute(output, ".*Cipher: \\(.\\{-}\\)\n.*", "\\1", "")
let s:GPGHash = substitute(output, ".*Hash: \\(.\\{-}\\)\n.*", "\\1", "")
- let s:GPGCompress = substitute(output, ".*Compress: \\(.\\{-}\\)\n.*", "\\1", "")
+ let s:GPGCompress = substitute(output, ".*Compress.\\{-}: \\(.\\{-}\\)\n.*", "\\1", "")
+
+ call s:GPGDebug(2, "public key algorithms: " . s:GPGPubkey)
+ call s:GPGDebug(2, "cipher algorithms: " . s:GPGCipher)
+ call s:GPGDebug(2, "hashing algorithms: " . s:GPGHash)
+ call s:GPGDebug(2, "compression algorithms: " . s:GPGCompress)
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGInit()")
endfunction
" Function: s:GPGCleanup() {{{2
@@ -263,9 +291,13 @@ endfunction
" cleanup on leaving vim
"
function s:GPGCleanup()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGCleanup()")
+
" wipe out screen
new +only
redraw!
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGCleanup()")
endfunction
" Function: s:GPGDecrypt() {{{2
@@ -273,6 +305,8 @@ endfunction
" decrypt the buffer and find all recipients of the encrypted file
"
function s:GPGDecrypt()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGDecrypt()")
+
" switch to binary mode to read the encrypted file
set bin
@@ -285,13 +319,14 @@ function s:GPGDecrypt()
let b:GPGOptions = []
" find the recipients of the file
+ let commandline = s:GPGCommand . " --verbose --decrypt --list-only --dry-run --batch --no-use-agent --logger-fd 1 \"" . filename . "\""
+ call s:GPGDebug(3, "command: " . commandline)
let &shellredir = s:shellredir
let &shell = s:shell
- let output = system(s:GPGCommand . " --verbose --decrypt --list-only --dry-run --batch --no-use-agent --logger-fd 1 \"" . filename . "\"")
+ let output = system(commandline)
let &shellredir = s:shellredirsave
let &shell = s:shellsave
- call s:GPGDebug(1, "output of command '" . s:GPGCommand . " --verbose --decrypt --list-only --dry-run --batch --no-use-agent --logger-fd 1 \"" . filename . "\"' is:")
- call s:GPGDebug(1, ">>>>> " . output . " <<<<<")
+ call s:GPGDebug(3, "output: ". output)
" check if the file is symmetric/asymmetric encrypted
if (match(output, "gpg: encrypted with [[:digit:]]\\+ passphrase") >= 0)
@@ -345,6 +380,7 @@ function s:GPGDecrypt()
echom "File is not encrypted, all GPG functions disabled!"
echohl None
set nobin
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
return
endif
@@ -357,9 +393,12 @@ function s:GPGDecrypt()
" finally decrypt the buffer content
" since even with the --quiet option passphrase typos will be reported,
" we must redirect stderr (using shell temporarily)
+ call s:GPGDebug(1, "decrypting file")
+ let commandline = "'[,']!" . s:GPGCommand . " --quiet --decrypt " . s:stderrredirnull
+ call s:GPGDebug(1, "command: " . commandline)
let &shellredir = s:shellredir
let &shell = s:shell
- exec "'[,']!" . s:GPGCommand . " --quiet --decrypt " . s:stderrredirnull
+ execute commandline
let &shellredir = s:shellredirsave
let &shell = s:shellsave
if (v:shell_error) " message could not be decrypted
@@ -369,6 +408,7 @@ function s:GPGDecrypt()
echohl None
bwipeout
set nobin
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
return
endif
@@ -381,6 +421,8 @@ function s:GPGDecrypt()
" refresh screen
redraw!
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
endfunction
" Function: s:GPGEncrypt() {{{2
@@ -388,6 +430,8 @@ endfunction
" encrypts the buffer to all previous recipients
"
function s:GPGEncrypt()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEncrypt()")
+
" save window view
let s:GPGWindowView = winsaveview()
call s:GPGDebug(2, "saved window view " . string(s:GPGWindowView))
@@ -406,10 +450,11 @@ function s:GPGEncrypt()
set bin
" guard for unencrypted files
- if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
- echohl GPGWarning
- echom "File is not encrypted, all GPG functions disabled!"
+ if (!exists("b:GPGEncrypted") || b:GPGEncrypted == 0)
+ echohl GPGError
+ let blackhole = input("Message could not be encrypted! File might be empty! (Press ENTER)")
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
return
endif
@@ -467,12 +512,13 @@ function s:GPGEncrypt()
endif
" encrypt the buffer
+ let commandline = "'[,']!" . s:GPGCommand . " --quiet --no-encrypt-to " . options . " " . s:stderrredirnull
+ call s:GPGDebug(1, "command: " . commandline)
let &shellredir = s:shellredir
let &shell = s:shell
- silent exec "'[,']!" . s:GPGCommand . " --quiet --no-encrypt-to " . options . " " . s:stderrredirnull
+ silent execute commandline
let &shellredir = s:shellredirsave
let &shell = s:shellsave
- call s:GPGDebug(1, "called gpg command is: " . "'[,']!" . s:GPGCommand . " --quiet --no-encrypt-to " . options . " " . s:stderrredirnull)
if (v:shell_error) " message could not be encrypted
" delete content of the buffer to be sure no data is written unencrypted
" content will be recovered in GPGEncryptPost()
@@ -481,9 +527,11 @@ function s:GPGEncrypt()
echohl GPGError
let blackhole = input("Message could not be encrypted! File might be empty! (Press ENTER)")
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
return
endif
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
endfunction
" Function: s:GPGEncryptPost() {{{2
@@ -491,8 +539,11 @@ endfunction
" undo changes don by encrypt, after writing
"
function s:GPGEncryptPost()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEncryptPost()")
+
" guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncryptPost()")
return
endif
@@ -514,6 +565,8 @@ function s:GPGEncryptPost()
" refresh screen
redraw!
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncryptPost()")
endfunction
" Function: s:GPGViewRecipients() {{{2
@@ -521,11 +574,14 @@ endfunction
" echo the recipients
"
function s:GPGViewRecipients()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGViewRecipients()")
+
" guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGWarning
echom "File is not encrypted, all GPG functions disabled!"
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewRecipients()")
return
endif
@@ -552,6 +608,8 @@ function s:GPGViewRecipients()
echom 'There are no known recipients!'
echohl None
endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewRecipients()")
endfunction
" Function: s:GPGEditRecipients() {{{2
@@ -559,11 +617,14 @@ endfunction
" create a scratch buffer with all recipients to add/remove recipients
"
function s:GPGEditRecipients()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEditRecipients()")
+
" guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGWarning
echom "File is not encrypted, all GPG functions disabled!"
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditRecipients()")
return
endif
@@ -648,12 +709,12 @@ function s:GPGEditRecipients()
" define highlight
if (has("syntax") && exists("g:syntax_on"))
- exec('syntax match GPGUnknownRecipient "' . syntaxPattern . '"')
+ execute 'syntax match GPGUnknownRecipient "' . syntaxPattern . '"'
highlight clear GPGUnknownRecipient
highlight link GPGUnknownRecipient GPGHighlightUnknownRecipient
syntax match GPGComment "^GPG:.*$"
- exec 'syntax match GPGComment "' . s:GPGMagicString . '.*$"'
+ execute 'syntax match GPGComment "' . s:GPGMagicString . '.*$"'
highlight clear GPGComment
highlight link GPGComment Comment
endif
@@ -665,17 +726,23 @@ function s:GPGEditRecipients()
silent normal! G
endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditRecipients()")
endfunction
" Function: s:GPGFinishRecipientsBuffer() {{{2
"
" create a new recipient list from RecipientsBuffer
+"
function s:GPGFinishRecipientsBuffer()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGFinishRecipientsBuffer()")
+
" guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGWarning
echom "File is not encrypted, all GPG functions disabled!"
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishRecipientsBuffer()")
return
endif
@@ -736,6 +803,8 @@ function s:GPGFinishRecipientsBuffer()
" reset modified flag
set nomodified
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishRecipientsBuffer()")
endfunction
" Function: s:GPGViewOptions() {{{2
@@ -743,11 +812,14 @@ endfunction
" echo the recipients
"
function s:GPGViewOptions()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGViewOptions()")
+
" guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGWarning
echom "File is not encrypted, all GPG functions disabled!"
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewOptions()")
return
endif
@@ -758,6 +830,8 @@ function s:GPGViewOptions()
echo option
endfor
endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGViewOptions()")
endfunction
" Function: s:GPGEditOptions() {{{2
@@ -765,11 +839,14 @@ endfunction
" create a scratch buffer with all recipients to add/remove recipients
"
function s:GPGEditOptions()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEditOptions()")
+
" guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGWarning
echom "File is not encrypted, all GPG functions disabled!"
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditOptions()")
return
endif
@@ -844,17 +921,23 @@ function s:GPGEditOptions()
highlight link GPGComment Comment
endif
endif
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEditOptions()")
endfunction
" Function: s:GPGFinishOptionsBuffer() {{{2
"
" create a new option list from OptionsBuffer
+"
function s:GPGFinishOptionsBuffer()
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGFinishOptionsBuffer()")
+
" guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGWarning
echom "File is not encrypted, all GPG functions disabled!"
echohl None
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishOptionsBuffer()")
return
endif
@@ -893,13 +976,18 @@ function s:GPGFinishOptionsBuffer()
" reset modified flag
set nomodified
+
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishOptionsBuffer()")
endfunction
" Function: s:GPGCheckRecipients(tocheck) {{{2
"
" check if recipients are known
" Returns: two lists recipients and unknownrecipients
+"
function s:GPGCheckRecipients(tocheck)
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGCheckRecipients()")
+
let recipients = []
let unknownrecipients = []
@@ -924,6 +1012,7 @@ function s:GPGCheckRecipients(tocheck)
call s:GPGDebug(2, "recipients are: " . string(recipients))
call s:GPGDebug(2, "unknown recipients are: " . string(unknownrecipients))
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGCheckRecipients()")
return [ recipients, unknownrecipients ]
endfunction
@@ -931,13 +1020,19 @@ endfunction
"
" find GPG key ID corresponding to a name
" Returns: ID for the given name
+"
function s:GPGNameToID(name)
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGNameToID()")
+
" ask gpg for the id for a name
+ let commandline = s:GPGCommand . " --quiet --with-colons --fixed-list-mode --list-keys \"" . a:name . "\""
+ call s:GPGDebug(2, "command: ". commandline)
let &shellredir = s:shellredir
let &shell = s:shell
- let output = system(s:GPGCommand . " --quiet --with-colons --fixed-list-mode --list-keys \"" . a:name . "\"")
+ let output = system(commandline)
let &shellredir = s:shellredirsave
let &shell = s:shellsave
+ call s:GPGDebug(2, "output: ". output)
" when called with "--with-colons" gpg encodes its output _ALWAYS_ as UTF-8,
" so convert it, if necessary
@@ -989,6 +1084,7 @@ function s:GPGNameToID(name)
endwhile
endif
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGIDToName()")
return get(gpgids, answer, "")
endfunction
@@ -996,15 +1092,21 @@ endfunction
"
" find name corresponding to a GPG key ID
" Returns: Name for the given ID
+"
function s:GPGIDToName(identity)
+ call s:GPGDebug(3, ">>>>>>>> Entering s:GPGIDToName()")
+
" TODO is the encryption subkey really unique?
" ask gpg for the id for a name
+ let commandline = s:GPGCommand . " --quiet --with-colons --fixed-list-mode --list-keys " . a:identity
+ call s:GPGDebug(2, "command: ". commandline)
let &shellredir = s:shellredir
let &shell = s:shell
- let output = system(s:GPGCommand . " --quiet --with-colons --fixed-list-mode --list-keys " . a:identity )
+ let output = system(commandline)
let &shellredir = s:shellredirsave
let &shell = s:shellsave
+ call s:GPGDebug(2, "output: ". output)
" when called with "--with-colons" gpg encodes its output _ALWAYS_ as UTF-8,
" so convert it, if necessary
@@ -1035,24 +1137,36 @@ function s:GPGIDToName(identity)
endif
endfor
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGIDToName()")
return uid
endfunction
" Function: s:GPGDebug(level, text) {{{2
"
" output debug message, if this message has high enough importance
+" only define function if GPGDebugLevel set at all
+"
function s:GPGDebug(level, text)
- if (g:GPGDebugLevel >= a:level)
- echom a:text
+ if exists("g:GPGDebugLevel") && g:GPGDebugLevel >= a:level
+ if exists("g:GPGDebugLog")
+ execute "redir >> " . g:GPGDebugLog
+ echom "GnuPG: " . a:text
+ redir END
+ else
+ echom "GnuPG: " . a:text
+ endif
endif
endfunction
-" Section: Command definitions {{{1
+" Section: Commands {{{1
+
command! GPGViewRecipients call s:GPGViewRecipients()
command! GPGEditRecipients call s:GPGEditRecipients()
command! GPGViewOptions call s:GPGViewOptions()
command! GPGEditOptions call s:GPGEditOptions()
+
" Section: Menu {{{1
+
if (has("menu"))
amenu <silent> Plugin.GnuPG.View\ Recipients :GPGViewRecipients<CR>
amenu <silent> Plugin.GnuPG.Edit\ Recipients :GPGEditRecipients<CR>
--
vim-scripts packaging
More information about the pkg-vim-maintainers
mailing list