vim/vim-gnupg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly handle the different keyid-format options

Browse Source 
Signed-off-by: James Vega <vega.james@gmail.com>
This commit is contained in:
James Vega 2011-08-13 18:00:27 -04:00 committed by James McCoy
parent 79a936311d
commit d645eb26cd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/gnupg.vim
View File

@ -1,5 +1,5 @@
" Name: gnupg.vim " Name: gnupg.vim
" Last Change: 2011 Aug 01 " Last Change: 2011 Aug 13
" Maintainer: James Vega <vega.james@gmail.com> " Maintainer: James Vega <vega.james@gmail.com>
" Original Author: Markus Braun <markus.braun@krawel.de> " Original Author: Markus Braun <markus.braun@krawel.de>
" Summary: Vim plugin for transparent editing of gpg encrypted files. " Summary: Vim plugin for transparent editing of gpg encrypted files.
@ -134,7 +134,7 @@
if (exists("g:loaded_gnupg") || &cp || exists("#BufReadCmd*.\(gpg\|asc\|pgp\)")) if (exists("g:loaded_gnupg") || &cp || exists("#BufReadCmd*.\(gpg\|asc\|pgp\)"))
finish finish
endif endif
let g:loaded_gnupg = '2.1' let g:loaded_gnupg = '2.2'
let s:GPGInitRun = 0 let s:GPGInitRun = 0
" check for correct vim version {{{2 " check for correct vim version {{{2
@ -366,6 +366,7 @@ function s:GPGDecrypt()
let &shelltemp = s:shelltempsave let &shelltemp = s:shelltempsave
call s:GPGDebug(3, "output: ". output) call s:GPGDebug(3, "output: ". output)
let asymmPattern = 'gpg: public key is \%(0x\)\=[[:xdigit:]]\{8,16}'
" check if the file is symmetric/asymmetric encrypted " check if the file is symmetric/asymmetric encrypted
if (match(output, "gpg: encrypted with [[:digit:]]\\+ passphrase") >= 0) if (match(output, "gpg: encrypted with [[:digit:]]\\+ passphrase") >= 0)
" file is symmetric encrypted " file is symmetric encrypted
@ -385,7 +386,7 @@ function s:GPGDecrypt()
echo echo
echohl None echohl None
endif endif
elseif (match(output, "gpg: public key is [[:xdigit:]]\\{8}") >= 0) elseif (match(output, asymmPattern) >= 0)
" file is asymmetric encrypted " file is asymmetric encrypted
let b:GPGEncrypted = 1 let b:GPGEncrypted = 1
call s:GPGDebug(1, "this file is asymmetric encrypted") call s:GPGDebug(1, "this file is asymmetric encrypted")
@ -393,10 +394,10 @@ function s:GPGDecrypt()
let b:GPGOptions += ["encrypt"] let b:GPGOptions += ["encrypt"]
" find the used public keys " find the used public keys
let start = match(output, "gpg: public key is [[:xdigit:]]\\{8}") let start = match(output, asymmPattern)
while (start >= 0) while (start >= 0)
let start = start + strlen("gpg: public key is ") let start = start + strlen("gpg: public key is ")
let recipient = strpart(output, start, 8) let recipient = matchstr(output, '[[:xdigit:]]\{8,16}', start)
call s:GPGDebug(1, "recipient is " . recipient) call s:GPGDebug(1, "recipient is " . recipient)
let name = s:GPGNameToID(recipient) let name = s:GPGNameToID(recipient)
if (strlen(name) > 0) if (strlen(name) > 0)
@ -408,7 +409,7 @@ function s:GPGDecrypt()
echom "The recipient \"" . recipient . "\" is not in your public keyring!" echom "The recipient \"" . recipient . "\" is not in your public keyring!"
echohl None echohl None
end end
let start = match(output, "gpg: public key is [[:xdigit:]]\\{8}", start) let start = match(output, asymmPattern, start)
endwhile endwhile
else else
" file is not encrypted " file is not encrypted