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

Ignore keys that aren't usable for encryption rather than just expired keys

Browse Source 
Signed-off-by: James McCoy <vega.james@gmail.com>
This commit is contained in:
James McCoy 2012-05-31 22:27:42 -04:00
parent ff9c9a8366
commit 8786427bb3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugin/gnupg.vim
View File

@ -139,7 +139,7 @@
if (exists("g:loaded_gnupg") || &cp || exists("#GnuPG")) if (exists("g:loaded_gnupg") || &cp || exists("#GnuPG"))
finish finish
endif endif
let g:loaded_gnupg = '2.4' let g:loaded_gnupg = '2.5'
let s:GPGInitRun = 0 let s:GPGInitRun = 0
" check for correct vim version {{{2 " check for correct vim version {{{2
@ -1091,11 +1091,6 @@ function s:GPGNameToID(name)
let fields = split(line, ":") let fields = split(line, ":")
" Ignore expired keys
if fields[1] == 'e'
continue
endif
" search for the next uid " search for the next uid
if pubseen if pubseen
if (fields[0] == "uid") if (fields[0] == "uid")
@ -1106,6 +1101,11 @@ function s:GPGNameToID(name)
" search for the next pub " search for the next pub
else else
if (fields[0] == "pub") if (fields[0] == "pub")
" Ignore keys which are not usable for encryption
if fields[11] !~? 'e'
continue
endif
let identity = fields[4] let identity = fields[4]
let gpgids += [identity] let gpgids += [identity]
if exists("*strftime") if exists("*strftime")
@ -1163,13 +1163,13 @@ function s:GPGIDToName(identity)
for line in lines for line in lines
let fields = split(line, ":") let fields = split(line, ":")
" Ignore expired keys
if fields[1] == 'e'
continue
endif
if !pubseen " search for the next pub if !pubseen " search for the next pub
if (fields[0] == "pub") if (fields[0] == "pub")
" Ignore keys which are not usable for encryption
if fields[11] !~? 'e'
continue
endif
let pubseen = 1 let pubseen = 1
endif endif
else " search for the next uid else " search for the next uid