From: Ivan Shmakov <ivan@siamics.net>
To: 19960@debbugs.gnu.org
Subject: bug#19960: epg: allow passing --keyring values via new epg-context-keyrings
Date: Fri, 27 Feb 2015 16:12:49 +0000 [thread overview]
Message-ID: <87lhjj1gfy.fsf@violet.siamics.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Package: emacs
Severity: wishlist
Tags: patch
Please consider the patch MIMEd.
* lisp/epg.el (epg-context): New slot: keyrings.
(epg--start): Use it.
(epg--list-keys-1): Likewise. (Bug#???)
An example code making use of this change (assuming that the
extra keyring is available at the location usual to Debian
Jessie) is also MIMEd.
(Tested on 619fc5c197eb, 2015-02-26 18:09:48 UTC.)
--
FSF associate member #7257 np. Gates of Tomorrow — Iron Maiden … 230E 334A
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/diff, Size: 1283 bytes --]
diff --git a/lisp/epg.el b/lisp/epg.el
index f665453..0768697 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -197,6 +197,7 @@ cl-defstruct epg-context
protocol
program
(home-directory epg-gpg-home-directory)
+ keyrings
armor
textmode
include-certs
@@ -570,6 +571,11 @@ defun epg--start (context args)
(if (epg-context-home-directory context)
(list "--homedir"
(epg-context-home-directory context)))
+ (if (epg-context-keyrings context)
+ (apply #'nconc
+ (mapcar (lambda (elt)
+ (list "--keyring" elt))
+ (epg-context-keyrings context))))
(unless (eq (epg-context-protocol context) 'CMS)
'("--command-fd" "0"))
(if (epg-context-armor context) '("--armor"))
@@ -1263,6 +1269,11 @@ defun epg--list-keys-1 (context name mode)
(let ((args (append (if (epg-context-home-directory context)
(list "--homedir"
(epg-context-home-directory context)))
+ (if (epg-context-keyrings context)
+ (apply #'nconc
+ (mapcar (lambda (elt)
+ (list "--keyring" elt))
+ (epg-context-keyrings context))))
'("--with-colons" "--no-greeting" "--batch"
"--with-fingerprint" "--with-fingerprint")
(unless (eq (epg-context-protocol context) 'CMS)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: Type: text/emacs-lisp, Size: 940 bytes --]
(let ((cx (epg-make-context 'OpenPGP))
(s (with-current-buffer
(url-retrieve-synchronously
"http://snapshot.debian.org/archive/debian/20140501T070413Z/dists/jessie/InRelease")
(buffer-substring-no-properties
url-http-end-of-headers (point-max))))
a b)
(setq a (progn
(epg-verify-string cx s)
(epg-context-result-for cx 'verify)))
(push "/etc/apt/trusted.gpg.d/debian-archive-wheezy-automatic.gpg"
(epg-context-keyrings cx))
(setq b (progn
(epg-verify-string cx s)
(epg-context-result-for cx 'verify)))
;; .
(list a b))
;; Expected result:
; (([cl-struct-epg-signature
; no-pubkey "8B48AD6246925553" nil nil
; (21345 . 47158) nil 1 8 1 nil nil])
; ([cl-struct-epg-signature
; good "8B48AD6246925553" undefined
; "A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553"
; (21345 . 47158) nil 1 8 1 4 nil]))
next reply other threads:[~2015-02-27 16:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 16:12 Ivan Shmakov [this message]
2015-04-20 22:25 ` bug#19960: epg: allow passing --keyring values via new epg-context-keyrings Ted Zlatanov
2015-04-21 1:40 ` Daiki Ueno
2015-04-21 10:04 ` Werner Koch
2015-04-21 11:16 ` Daiki Ueno
2015-04-21 11:37 ` Ted Zlatanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lhjj1gfy.fsf@violet.siamics.net \
--to=ivan@siamics.net \
--cc=19960@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).