From 3644a0ab086211d47473da0d883016e432ce10e6 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 17 Aug 2011 10:31:05 +0900
Subject: [PATCH] Simplify GnuPG group expansion using epg-expand-group.
* epa-mail.el: Simplify GnuPG group expansion using
epg-expand-group.
(epa-mail-group-alist, epa-mail-group-modtime)
(epa-mail-gnupg-conf-file, epa-mail-parse-groups)
(epa-mail-sync-groups, epa-mail-expand-recipient-1)
(epa-mail-expand-recipients-2, epa-mail-expand-recipients):
Remove.
---
lisp/ChangeLog | 10 ++++++
lisp/epa-mail.el | 82 ++++++------------------------------------------
2 files changed, 20 insertions(+), 72 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f603a6ad64..0bed14f625d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-17 Daiki Ueno <ueno@unixuser.org>
+
+ * epa-mail.el: Simplify GnuPG group expansion using
+ epg-expand-group.
+ (epa-mail-group-alist, epa-mail-group-modtime)
+ (epa-mail-gnupg-conf-file, epa-mail-parse-groups)
+ (epa-mail-sync-groups, epa-mail-expand-recipient-1)
+ (epa-mail-expand-recipients-2, epa-mail-expand-recipients):
+ Remove.
+
2011-08-16 Feng Li <fengli@gmail.com> (tiny change)
* calc/calc-ext.el (math-defintegral-2): Remove nested backquote.
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index e6f6c0ec2b1..9d7542b3980 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -50,11 +50,9 @@
"A minor-mode for composing encrypted/clearsigned mails."
nil " epa-mail" epa-mail-mode-map)
-;;; ??? Could someone please clarify this doc string?
-;;; In particular, what does USAGE look like
-;;; and what does it mean? -- rms
(defun epa-mail--find-usable-key (keys usage)
- "Find a usable key from KEYS for USAGE."
+ "Find a usable key from KEYS for USAGE.
+USAGE would be `sign' or `encrypt'."
(catch 'found
(while keys
(let ((pointer (epg-key-sub-key-list (car keys))))
@@ -66,71 +64,6 @@
(setq pointer (cdr pointer))))
(setq keys (cdr keys)))))
-(defvar epa-mail-group-alist nil
- "Alist of GnuPG mail groups (`group' commands in `.gnupg/gpg.conf').
-Each element has the form (GROUPNAME ADDRESSES...).
-t means the list is not yet read in.")
-
-(defvar epa-mail-group-modtime nil
- "The modification time of `~/.gnupg/gpg.conf' file when last examined.")
-
-(defvar epa-mail-gnupg-conf-file "~/.gnupg/gpg.conf"
- "File name of GnuPG configuration file that specifies recipient groups.")
-
-(defun epa-mail-parse-groups ()
- "Parse `~/.gnupg/gpg.conf' and set `epa-mail-group-alist' from it."
- (let (aliases)
- (with-temp-buffer
- (insert-file-contents-literally epa-mail-gnupg-conf-file)
-
- (while (re-search-forward "^[ \t]*group[ \t]*" nil t)
- (if (looking-at "\\([^= \t]+\\)[ \t]*=[ \t]*\\([^ \t\n]+\\)")
- (push (cons (match-string-no-properties 1)
- (split-string (match-string-no-properties 2)))
- aliases))))
- (setq epa-mail-group-alist aliases)))
-
-(defun epa-mail-sync-groups ()
- "Update GnuPG groups from file if necessary."
- (if (file-exists-p epa-mail-gnupg-conf-file)
- (let ((modtime (nth 5 (file-attributes epa-mail-gnupg-conf-file))))
- (if (not (equal epa-mail-group-modtime modtime))
- (progn
- (setq epa-mail-group-modtime modtime)
- (epa-mail-parse-groups))))
- (setq epa-mail-group-alist nil)))
-
-(defun epa-mail-expand-recipient-1 (recipient)
- "Expand RECIPIENT once thru `epa-mail-group-alist'.
-Returns the list of names it stands for, or nil if it isn't a group."
- ;; Load the alias list if not loaded before.
- (let (alist-elt)
- (setq alist-elt (assoc recipient epa-mail-group-alist))
- (cdr alist-elt)))
-
-(defun epa-mail-expand-recipients-2 (recipients)
- "Expand list RECIPIENTS once thru `epa-mail-group-alist'.
-Returns the list of names they stand for."
- ;; Load the alias list if not loaded before.
- (let (output)
- (dolist (r recipients)
- (let ((expanded (epa-mail-expand-recipient-1 r)))
- (if expanded
- (dolist (xr expanded)
- (unless (member xr output)
- (push xr output)))
- (unless (member r output)
- (push r output)))))
- (nreverse output)))
-
-(defun epa-mail-expand-recipients (recipients)
- "Expand RECIPIENTS thru `epa-mail-group-alist' until it stops changing."
- (epa-mail-sync-groups)
- (while (not (equal recipients
- (setq recipients
- (epa-mail-expand-recipients-2 recipients)))))
- recipients)
-
;;;###autoload
(defun epa-mail-decrypt ()
"Decrypt OpenPGP armors in the current buffer.
@@ -184,6 +117,7 @@ Don't use this command in Lisp programs!"
(interactive
(save-excursion
(let ((verbose current-prefix-arg)
+ (config (epg-configuration))
(context (epg-make-context epa-protocol))
recipients-string recipients recipient-key sign)
(goto-char (point-min))
@@ -211,9 +145,13 @@ Don't use this command in Lisp programs!"
;; Process all the recipients thru the list of GnuPG groups.
;; Expand GnuPG group names to what they stand for.
- ;; The code below, and elsewhere, that checks that names have keys
- ;; does not know about these group names.
- (setq recipients (epa-mail-expand-recipients recipients))
+ (setq recipients
+ (apply #'nconc
+ (mapcar
+ (lambda (recipient)
+ (or (epg-expand-group config recipient)
+ (list recipient)))
+ recipients)))
(goto-char (point-min))
(if (search-forward mail-header-separator nil t)
--
2.39.5