annotate lisp/pgg-gpg.el @ 72632:d69718b12697

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 129-130) - Merge from emacs--devo--0 - Update from CVS 2006-09-04 Daiki Ueno <ueno@unixuser.org> * lisp/pgg-gpg.el (pgg-gpg-process-region): Revert two patches from Satyaki Das. http://article.gmane.org/gmane.emacs.gnus.general/49947 http://article.gmane.org/gmane.emacs.gnus.general/50457 2006-09-04 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/rfc2047.el (rfc2047-strip-backslashes-in-quoted-strings): Decode `\\' in quoted string into `\'. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-421
author Miles Bader <miles@gnu.org>
date Mon, 04 Sep 2006 06:27:27 +0000
parents a80d40a59be6
children 87c011891481
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1 ;;; pgg-gpg.el --- GnuPG support for PGG.
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
2
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
3 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
68651
3bd95f4f2941 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 66520
diff changeset
4 ;; 2005, 2006 Free Software Foundation, Inc.
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
5
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
6 ;; Author: Daiki Ueno <ueno@unixuser.org>
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
7 ;; Symmetric encryption and gpg-agent support added by:
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
8 ;; Sascha Wilde <wilde@sha-bang.de>
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
9 ;; Created: 1999/10/28
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
10 ;; Keywords: PGP, OpenPGP, GnuPG
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
11
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
12 ;; This file is part of GNU Emacs.
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
13
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
14 ;; GNU Emacs is free software; you can redistribute it and/or modify
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
15 ;; it under the terms of the GNU General Public License as published by
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
16 ;; the Free Software Foundation; either version 2, or (at your option)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
17 ;; any later version.
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
18
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
19 ;; GNU Emacs is distributed in the hope that it will be useful,
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
22 ;; GNU General Public License for more details.
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
23
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
24 ;; You should have received a copy of the GNU General Public License
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
25 ;; along with GNU Emacs; see the file COPYING. If not, write to the
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
26 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
27 ;; Boston, MA 02110-1301, USA.
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
28
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
29 ;;; Code:
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
30
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
31 (eval-when-compile
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
32 (require 'cl) ; for gpg macros
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
33 (require 'pgg))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
34
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
35 (defgroup pgg-gpg ()
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
36 "GnuPG interface."
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
37 :group 'pgg)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
38
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
39 (defcustom pgg-gpg-program "gpg"
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
40 "The GnuPG executable."
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
41 :group 'pgg-gpg
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
42 :type 'string)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
43
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
44 (defcustom pgg-gpg-extra-args nil
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
45 "Extra arguments for every GnuPG invocation."
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
46 :group 'pgg-gpg
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
47 :type '(repeat (string :tag "Argument")))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
48
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
49 (defcustom pgg-gpg-recipient-argument "--recipient"
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
50 "GnuPG option to specify recipient."
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
51 :group 'pgg-gpg
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
52 :type '(choice (const :tag "New `--recipient' option" "--recipient")
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
53 (const :tag "Old `--remote-user' option" "--remote-user")))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
54
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
55 (defcustom pgg-gpg-use-agent nil
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
56 "Whether to use gnupg agent for key caching."
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
57 :group 'pgg-gpg
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
58 :type 'boolean)
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
59
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
60 (defvar pgg-gpg-user-id nil
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
61 "GnuPG ID of your default identity.")
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
62
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
63 (defun pgg-gpg-process-region (start end passphrase program args)
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
64 (let* ((use-agent (pgg-gpg-use-agent-p))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
65 (output-file-name (pgg-make-temp-file "pgg-output"))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
66 (args
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
67 `("--status-fd" "2"
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
68 ,@(if use-agent '("--use-agent")
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
69 (if passphrase '("--passphrase-fd" "0")))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
70 "--yes" ; overwrite
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
71 "--output" ,output-file-name
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
72 ,@pgg-gpg-extra-args ,@args))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
73 (output-buffer pgg-output-buffer)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
74 (errors-buffer pgg-errors-buffer)
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
75 (orig-mode (default-file-modes))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
76 (process-connection-type nil)
72632
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
77 process status exit-status)
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
78 (with-current-buffer (get-buffer-create errors-buffer)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
79 (buffer-disable-undo)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
80 (erase-buffer))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
81 (unwind-protect
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
82 (progn
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
83 (set-default-file-modes 448)
72632
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
84 (let ((coding-system-for-write 'binary))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
85 (setq process
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
86 (apply #'start-process "*GnuPG*" errors-buffer
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
87 program args)))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
88 (set-process-sentinel process #'ignore)
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
89 (when passphrase
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
90 (process-send-string process (concat passphrase "\n")))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
91 (process-send-region process start end)
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
92 (process-send-eof process)
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
93 (while (eq 'run (process-status process))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
94 (accept-process-output process 5))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
95 (setq status (process-status process)
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
96 exit-status (process-exit-status process))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
97 (delete-process process)
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
98 (with-current-buffer (get-buffer-create output-buffer)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
99 (buffer-disable-undo)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
100 (erase-buffer)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
101 (if (file-exists-p output-file-name)
69791
4192bb0fddd0 2006-04-04 Daiki Ueno <ueno@unixuser.org>
Simon Josefsson <jas@extundo.com>
parents: 69775
diff changeset
102 (let ((coding-system-for-read (if pgg-text-mode
4192bb0fddd0 2006-04-04 Daiki Ueno <ueno@unixuser.org>
Simon Josefsson <jas@extundo.com>
parents: 69775
diff changeset
103 'raw-text
4192bb0fddd0 2006-04-04 Daiki Ueno <ueno@unixuser.org>
Simon Josefsson <jas@extundo.com>
parents: 69775
diff changeset
104 'binary)))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
105 (insert-file-contents output-file-name)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
106 (set-buffer errors-buffer)
72632
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
107 (if (memq status '(stop signal))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
108 (error "%s exited abnormally: '%s'" program exit-status))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
109 (if (= 127 exit-status)
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
110 (error "%s could not be found" program))))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
111 (if (and process (eq 'run (process-status process)))
d69718b12697 Merge from gnus--rel--5.10
Miles Bader <miles@gnu.org>
parents: 69848
diff changeset
112 (interrupt-process process))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
113 (if (file-exists-p output-file-name)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
114 (delete-file output-file-name))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
115 (set-default-file-modes orig-mode))))
69689
d9ccf8ac6466 2006-03-27 Daiki Ueno <ueno@unixuser.org>
Simon Josefsson <jas@extundo.com>
parents: 69646
diff changeset
116
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
117 (defun pgg-gpg-possibly-cache-passphrase (passphrase &optional key notruncate)
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
118 (if (and passphrase
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
119 pgg-cache-passphrase
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
120 (progn
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
121 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
122 (re-search-forward "^\\[GNUPG:] \\(GOOD_PASSPHRASE\\>\\)\\|\\(SIG_CREATED\\)" nil t)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
123 (pgg-add-passphrase-to-cache
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
124 (or key
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
125 (progn
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
126 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
127 (if (re-search-forward
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
128 "^\\[GNUPG:] NEED_PASSPHRASE\\(_PIN\\)? \\w+ ?\\w*" nil t)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
129 (substring (match-string 0) -8))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
130 passphrase
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
131 notruncate)))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
132
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
133 (defvar pgg-gpg-all-secret-keys 'unknown)
69689
d9ccf8ac6466 2006-03-27 Daiki Ueno <ueno@unixuser.org>
Simon Josefsson <jas@extundo.com>
parents: 69646
diff changeset
134
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
135 (defun pgg-gpg-lookup-all-secret-keys ()
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
136 "Return all secret keys present in secret key ring."
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
137 (when (eq pgg-gpg-all-secret-keys 'unknown)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
138 (setq pgg-gpg-all-secret-keys '())
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
139 (let ((args (list "--with-colons" "--no-greeting" "--batch"
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
140 "--list-secret-keys")))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
141 (with-temp-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
142 (apply #'call-process pgg-gpg-program nil t nil args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
143 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
144 (while (re-search-forward
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
145 "^\\(sec\\|pub\\):[^:]*:[^:]*:[^:]*:\\([^:]*\\)" nil t)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
146 (push (substring (match-string 2) 8)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
147 pgg-gpg-all-secret-keys)))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
148 pgg-gpg-all-secret-keys)
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
149
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
150 (defun pgg-gpg-lookup-key (string &optional type)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
151 "Search keys associated with STRING."
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
152 (let ((args (list "--with-colons" "--no-greeting" "--batch"
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
153 (if type "--list-secret-keys" "--list-keys")
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
154 string)))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
155 (with-temp-buffer
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
156 (apply #'call-process pgg-gpg-program nil t nil args)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
157 (goto-char (point-min))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
158 (if (re-search-forward "^\\(sec\\|pub\\):[^:]*:[^:]*:[^:]*:\\([^:]*\\)"
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
159 nil t)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
160 (substring (match-string 2) 8)))))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
161
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
162 (defun pgg-gpg-lookup-key-owner (string &optional all)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
163 "Search keys associated with STRING and return owner of identified key.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
164
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
165 The value may be just the bare key id, or it may be a combination of the
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
166 user name associated with the key and the key id, with the key id enclosed
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
167 in \"<...>\" angle brackets.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
168
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
169 Optional ALL non-nil means search all keys, including secret keys."
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
170 (let ((args (list "--with-colons" "--no-greeting" "--batch"
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
171 (if all "--list-secret-keys" "--list-keys")
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
172 string))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
173 (key-regexp (concat "^\\(sec\\|pub\\)"
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
174 ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):[^:]*"
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
175 ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):")))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
176 (with-temp-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
177 (apply #'call-process pgg-gpg-program nil t nil args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
178 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
179 (if (re-search-forward key-regexp
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
180 nil t)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
181 (match-string 3)))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
182
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
183 (defun pgg-gpg-key-id-from-key-owner (key-owner)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
184 (cond ((not key-owner) nil)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
185 ;; Extract bare key id from outermost paired angle brackets, if any:
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
186 ((string-match "[^<]*<\\(.+\\)>[^>]*" key-owner)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
187 (substring key-owner (match-beginning 1)(match-end 1)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
188 (key-owner)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
189
66520
67afcf271a8f (pgg-gpg-select-matching-key): Fixed: look at the right part of the
Eli Zaretskii <eliz@gnu.org>
parents: 66383
diff changeset
190 (defun pgg-gpg-encrypt-region (start end recipients &optional sign passphrase)
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
191 "Encrypt the current region between START and END.
66520
67afcf271a8f (pgg-gpg-select-matching-key): Fixed: look at the right part of the
Eli Zaretskii <eliz@gnu.org>
parents: 66383
diff changeset
192
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
193 If optional argument SIGN is non-nil, do a combined sign and encrypt.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
194
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
195 If optional PASSPHRASE is not specified, it will be obtained from the
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
196 passphrase cache or user."
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
197 (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
198 (passphrase (or passphrase
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
199 (when (and sign (not (pgg-gpg-use-agent-p)))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
200 (pgg-read-passphrase
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
201 (format "GnuPG passphrase for %s: "
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
202 pgg-gpg-user-id)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
203 pgg-gpg-user-id))))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
204 (args
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
205 (append
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
206 (list "--batch" "--armor" "--always-trust" "--encrypt")
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
207 (if pgg-text-mode (list "--textmode"))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
208 (if sign (list "--sign" "--local-user" pgg-gpg-user-id))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
209 (if recipients
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
210 (apply #'nconc
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
211 (mapcar (lambda (rcpt)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
212 (list pgg-gpg-recipient-argument rcpt))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
213 (append recipients
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
214 (if pgg-encrypt-for-me
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
215 (list pgg-gpg-user-id)))))))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
216 (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
217 (when sign
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
218 (with-current-buffer pgg-errors-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
219 ;; Possibly cache passphrase under, e.g. "jas", for future sign.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
220 (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
221 ;; Possibly cache passphrase under, e.g. B565716F, for future decrypt.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
222 (pgg-gpg-possibly-cache-passphrase passphrase)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
223 (pgg-process-when-success)))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
224
66520
67afcf271a8f (pgg-gpg-select-matching-key): Fixed: look at the right part of the
Eli Zaretskii <eliz@gnu.org>
parents: 66383
diff changeset
225 (defun pgg-gpg-encrypt-symmetric-region (start end &optional passphrase)
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
226 "Encrypt the current region between START and END with symmetric cipher.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
227
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
228 If optional PASSPHRASE is not specified, it will be obtained from the
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
229 passphrase cache or user."
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
230 (let* ((passphrase (or passphrase
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
231 (when (not (pgg-gpg-use-agent-p))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
232 (pgg-read-passphrase
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
233 "GnuPG passphrase for symmetric encryption: "))))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
234 (args
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
235 (append (list "--batch" "--armor" "--symmetric" )
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
236 (if pgg-text-mode (list "--textmode")))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
237 (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
238 (pgg-process-when-success)))
66520
67afcf271a8f (pgg-gpg-select-matching-key): Fixed: look at the right part of the
Eli Zaretskii <eliz@gnu.org>
parents: 66383
diff changeset
239
67afcf271a8f (pgg-gpg-select-matching-key): Fixed: look at the right part of the
Eli Zaretskii <eliz@gnu.org>
parents: 66383
diff changeset
240 (defun pgg-gpg-decrypt-region (start end &optional passphrase)
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
241 "Decrypt the current region between START and END.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
242
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
243 If optional PASSPHRASE is not specified, it will be obtained from the
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
244 passphrase cache or user."
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
245 (let* ((current-buffer (current-buffer))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
246 (message-keys (with-temp-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
247 (insert-buffer-substring current-buffer)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
248 (pgg-decode-armor-region (point-min) (point-max))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
249 (secret-keys (pgg-gpg-lookup-all-secret-keys))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
250 ;; XXX the user is stuck if they need to use the passphrase for
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
251 ;; any but the first secret key for which the message is
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
252 ;; encrypted. ideally, we would incrementally give them a
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
253 ;; chance with subsequent keys each time they fail with one.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
254 (key (pgg-gpg-select-matching-key message-keys secret-keys))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
255 (key-owner (and key (pgg-gpg-lookup-key-owner key t)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
256 (key-id (pgg-gpg-key-id-from-key-owner key-owner))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
257 (pgg-gpg-user-id (or key-id key
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
258 pgg-gpg-user-id pgg-default-user-id))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
259 (passphrase (or passphrase
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
260 (when (not (pgg-gpg-use-agent-p))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
261 (pgg-read-passphrase
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
262 (format (if (pgg-gpg-symmetric-key-p message-keys)
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
263 "Passphrase for symmetric decryption: "
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
264 "GnuPG passphrase for %s: ")
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
265 (or key-owner "??"))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
266 pgg-gpg-user-id))))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
267 (args '("--batch" "--decrypt")))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
268 (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
269 (with-current-buffer pgg-errors-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
270 (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
271 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
272 (re-search-forward "^\\[GNUPG:] DECRYPTION_OKAY\\>" nil t))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
273
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
274 ;;;###autoload
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
275 (defun pgg-gpg-symmetric-key-p (message-keys)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
276 "True if decoded armor MESSAGE-KEYS has symmetric encryption indicator."
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
277 (let (result)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
278 (dolist (key message-keys result)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
279 (when (and (eq (car key) 3)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
280 (member '(symmetric-key-algorithm) key))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
281 (setq result key)))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
282
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
283 (defun pgg-gpg-select-matching-key (message-keys secret-keys)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
284 "Choose a key from MESSAGE-KEYS that matches one of the keys in SECRET-KEYS."
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
285 (loop for message-key in message-keys
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
286 for message-key-id = (and (equal (car message-key) 1)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
287 (cdr (assq 'key-identifier
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
288 (cdr message-key))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
289 for key = (and message-key-id (pgg-lookup-key message-key-id 'encrypt))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
290 when (and key (member key secret-keys)) return key))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
291
66520
67afcf271a8f (pgg-gpg-select-matching-key): Fixed: look at the right part of the
Eli Zaretskii <eliz@gnu.org>
parents: 66383
diff changeset
292 (defun pgg-gpg-sign-region (start end &optional cleartext passphrase)
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
293 "Make detached signature from text between START and END."
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
294 (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
295 (passphrase (or passphrase
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
296 (when (not (pgg-gpg-use-agent-p))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
297 (pgg-read-passphrase
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
298 (format "GnuPG passphrase for %s: "
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
299 pgg-gpg-user-id)
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
300 pgg-gpg-user-id))))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
301 (args
68762
970bf6e6463b Revision: emacs@sv.gnu.org/emacs--devo--0--patch-62
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
302 (append (list (if cleartext "--clearsign" "--detach-sign")
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
303 "--armor" "--batch" "--verbose"
68762
970bf6e6463b Revision: emacs@sv.gnu.org/emacs--devo--0--patch-62
Miles Bader <miles@gnu.org>
parents: 68651
diff changeset
304 "--local-user" pgg-gpg-user-id)
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
305 (if pgg-text-mode (list "--textmode"))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
306 (inhibit-read-only t)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
307 buffer-read-only)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
308 (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
309 (with-current-buffer pgg-errors-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
310 ;; Possibly cache passphrase under, e.g. "jas", for future sign.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
311 (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
312 ;; Possibly cache passphrase under, e.g. B565716F, for future decrypt.
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
313 (pgg-gpg-possibly-cache-passphrase passphrase))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
314 (pgg-process-when-success)))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
315
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
316 (defun pgg-gpg-verify-region (start end &optional signature)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
317 "Verify region between START and END as the detached signature SIGNATURE."
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
318 (let ((args '("--batch" "--verify")))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
319 (when (stringp signature)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
320 (setq args (append args (list signature))))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
321 (setq args (append args '("-")))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
322 (pgg-gpg-process-region start end nil pgg-gpg-program args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
323 (with-current-buffer pgg-errors-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
324 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
325 (while (re-search-forward "^gpg: \\(.*\\)\n" nil t)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
326 (with-current-buffer pgg-output-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
327 (insert-buffer-substring pgg-errors-buffer
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
328 (match-beginning 1) (match-end 0)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
329 (delete-region (match-beginning 0) (match-end 0)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
330 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
331 (re-search-forward "^\\[GNUPG:] GOODSIG\\>" nil t))))
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
332
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
333 (defun pgg-gpg-insert-key ()
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
334 "Insert public key at point."
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
335 (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
336 (args (list "--batch" "--export" "--armor"
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
337 pgg-gpg-user-id)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
338 (pgg-gpg-process-region (point)(point) nil pgg-gpg-program args)
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
339 (insert-buffer-substring pgg-output-buffer)))
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
340
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
341 (defun pgg-gpg-snarf-keys-region (start end)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
342 "Add all public keys in region between START and END to the keyring."
69819
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
343 (let ((args '("--import" "--batch" "-")) status)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
344 (pgg-gpg-process-region start end nil pgg-gpg-program args)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
345 (set-buffer pgg-errors-buffer)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
346 (goto-char (point-min))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
347 (when (re-search-forward "^\\[GNUPG:] IMPORT_RES\\>" nil t)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
348 (setq status (buffer-substring (match-end 0)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
349 (progn (end-of-line)(point)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
350 status (vconcat (mapcar #'string-to-number (split-string status))))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
351 (erase-buffer)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
352 (insert (format "Imported %d key(s).
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
353 \tArmor contains %d key(s) [%d bad, %d old].\n"
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
354 (+ (aref status 2)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
355 (aref status 10))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
356 (aref status 0)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
357 (aref status 1)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
358 (+ (aref status 4)
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
359 (aref status 11)))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
360 (if (zerop (aref status 9))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
361 ""
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
362 "\tSecret keys are imported.\n")))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
363 (append-to-buffer pgg-output-buffer (point-min)(point-max))
f5b96aac4371 2006-04-06 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents: 69805
diff changeset
364 (pgg-process-when-success)))
69631
77a585c555e6 2006-03-22 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 69627
diff changeset
365
69848
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
366 (defun pgg-gpg-update-agent ()
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
367 "Try to connet to gpg-agent and send UPDATESTARTUPTTY."
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
368 (if (fboundp 'make-network-process)
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
369 (let* ((agent-info (getenv "GPG_AGENT_INFO"))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
370 (socket (and agent-info
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
371 (string-match "^\\([^:]*\\)" agent-info)
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
372 (match-string 1 agent-info)))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
373 (conn (and socket
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
374 (make-network-process :name "gpg-agent-process"
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
375 :host 'local :family 'local
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
376 :service socket))))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
377 (when (and conn (eq (process-status conn) 'open))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
378 (process-send-string conn "UPDATESTARTUPTTY\n")
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
379 (delete-process conn)
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
380 t))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
381 ;; We can't check, so assume gpg-agent is up.
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
382 t))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
383
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
384 (defun pgg-gpg-use-agent-p ()
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
385 "Return t if `pgg-gpg-use-agent' is t and gpg-agent is available."
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
386 (and pgg-gpg-use-agent (pgg-gpg-update-agent)))
a80d40a59be6 Revert to revision 1.8 to allow the use of gpg-agent.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 69819
diff changeset
387
66383
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
388 (provide 'pgg-gpg)
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
389
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
390 ;;; arch-tag: 2aa5d5d8-93a0-4865-9312-33e29830e000
c82982d6cbc4 Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
391 ;;; pgg-gpg.el ends here