;;; pgg-gpg.el --- GnuPG support for PGG.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
-;; Symmetric encryption support added by: Sascha Wilde <wilde@sha-bang.de>
+;; Symmetric encryption and gpg-agent support added by:
+;; Sascha Wilde <wilde@sha-bang.de>
;; Created: 1999/10/28
;; Keywords: PGP, OpenPGP, GnuPG
+;; Package: pgg
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
(eval-when-compile
+ (require 'cl) ; for gpg macros
(require 'pgg))
(defgroup pgg-gpg ()
:type '(choice (const :tag "New `--recipient' option" "--recipient")
(const :tag "Old `--remote-user' option" "--remote-user")))
-(defcustom pgg-gpg-use-agent nil
+(defcustom pgg-gpg-use-agent t
"Whether to use gnupg agent for key caching."
:group 'pgg-gpg
:type 'boolean)
(defvar pgg-gpg-user-id nil
"GnuPG ID of your default identity.")
-(defvar pgg-gpg-user-id-alist nil
- "An alist mapping from key ID to user ID.")
-
-(defvar pgg-gpg-read-point nil)
-(defvar pgg-gpg-output-file-name nil)
-(defvar pgg-gpg-pending-status-list nil)
-(defvar pgg-gpg-key-id nil)
-(defvar pgg-gpg-passphrase nil)
-(defvar pgg-gpg-debug nil)
-
-(defun pgg-gpg-start-process (args)
- (let* ((output-file-name (pgg-make-temp-file "pgg-output"))
+(defun pgg-gpg-process-region (start end passphrase program args)
+ (let* ((use-agent (and (null passphrase) (pgg-gpg-use-agent-p)))
+ (output-file-name (pgg-make-temp-file "pgg-output"))
(args
- (append (list "--no-tty"
- "--status-fd" "1"
- "--command-fd" "0"
- "--yes" ; overwrite
- "--output" output-file-name)
- (if pgg-gpg-use-agent '("--use-agent"))
- pgg-gpg-extra-args
- args))
- (coding-system-for-write 'binary)
- (process-connection-type nil)
+ `("--status-fd" "2"
+ ,@(if use-agent '("--use-agent")
+ (if passphrase '("--passphrase-fd" "0")))
+ "--yes" ; overwrite
+ "--output" ,output-file-name
+ ,@pgg-gpg-extra-args ,@args))
+ (output-buffer pgg-output-buffer)
+ (errors-buffer pgg-errors-buffer)
(orig-mode (default-file-modes))
- (buffer (generate-new-buffer " *pgg-gpg*"))
- process)
- (with-current-buffer buffer
- (make-local-variable 'pgg-gpg-read-point)
- (setq pgg-gpg-read-point (point-min))
- (make-local-variable 'pgg-gpg-output-file-name)
- (setq pgg-gpg-output-file-name output-file-name)
- (make-local-variable 'pgg-gpg-pending-status-list)
- (setq pgg-gpg-pending-status-list nil)
- (make-local-variable 'pgg-gpg-key-id)
- (setq pgg-gpg-key-id nil)
- (make-local-variable 'pgg-gpg-passphrase)
- (setq pgg-gpg-passphrase nil))
+ (process-connection-type nil)
+ (inhibit-redisplay t)
+ process status exit-status
+ passphrase-with-newline
+ encoded-passphrase-with-new-line)
+ (with-current-buffer (get-buffer-create errors-buffer)
+ (buffer-disable-undo)
+ (erase-buffer))
(unwind-protect
(progn
(set-default-file-modes 448)
- (setq process
- (apply #'start-process "pgg-gpg" buffer pgg-gpg-program args)))
- (set-default-file-modes orig-mode))
- (set-process-filter process #'pgg-gpg-process-filter)
- (set-process-sentinel process #'pgg-gpg-process-sentinel)
- process))
-
-(defun pgg-gpg-process-filter (process input)
- (if pgg-gpg-debug
- (save-excursion
- (set-buffer (get-buffer-create " *pgg-gpg-debug*"))
- (goto-char (point-max))
- (insert input)))
- (if (buffer-live-p (process-buffer process))
- (save-excursion
- (set-buffer (process-buffer process))
- (goto-char (point-max))
- (insert input)
- (goto-char pgg-gpg-read-point)
- (beginning-of-line)
- (while (looking-at ".*\n") ;the input line is finished
- (save-excursion
- (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\)\\>.*")
- (let* ((status (match-string 1))
- (symbol (intern-soft (concat "pgg-gpg-status-"
- status))))
- (if (member status pgg-gpg-pending-status-list)
- (setq pgg-gpg-pending-status-list nil))
- (if (and symbol
- (fboundp symbol))
- (funcall symbol process (buffer-substring
- (match-beginning 1)
- (match-end 0)))))))
- (forward-line))
- (setq pgg-gpg-read-point (point)))))
-
-(eval-and-compile
- (cond ((and (fboundp 'string-to-multibyte)
- (subrp (symbol-function 'string-to-multibyte)))
- (defalias 'pgg-string-to-multibyte 'string-to-multibyte))
- ((and (fboundp 'string-as-multibyte)
- (subrp (symbol-function 'string-as-multibyte)))
- (defun pgg-string-to-multibyte (string) "\
-Return a multibyte string with the same individual chars as string."
- (mapconcat
- (lambda (ch) (string-as-multibyte (char-to-string ch)))
- string "")))
- (t
- (defalias 'pgg-string-to-multibyte 'identity))))
-
-(defun pgg-gpg-process-sentinel (process status)
- (if (buffer-live-p (process-buffer process))
- (save-excursion
- (set-buffer (process-buffer process))
- (when pgg-gpg-passphrase
- (fillarray pgg-gpg-passphrase 0)
- (setq pgg-gpg-passphrase nil))
- ;; Copy the contents of process-buffer to pgg-errors-buffer.
- (set-buffer (get-buffer-create pgg-errors-buffer))
- (buffer-disable-undo)
- (erase-buffer)
- (insert-buffer-substring (process-buffer process))
- ;; Read the contents of the output file to pgg-output-buffer.
- (set-buffer (let ((default-enable-multibyte-characters t))
- (get-buffer-create pgg-output-buffer)))
- (buffer-disable-undo)
- (erase-buffer)
- (if (equal status "finished\n")
- (let ((output-file-name
- (with-current-buffer (process-buffer process)
- pgg-gpg-output-file-name)))
- (when (file-exists-p output-file-name)
- ;; Buffer's multibyteness might be turned off after
- ;; inserting file's contents, as the case may be.
+ (let ((coding-system-for-write 'binary))
+ (setq process
+ (apply #'start-process "*GnuPG*" errors-buffer
+ program args)))
+ (set-process-sentinel process #'ignore)
+ (when passphrase
+ (setq passphrase-with-newline (concat passphrase "\n"))
+ (if pgg-passphrase-coding-system
+ (progn
+ (setq encoded-passphrase-with-new-line
+ (encode-coding-string
+ passphrase-with-newline
+ (coding-system-change-eol-conversion
+ pgg-passphrase-coding-system 'unix)))
+ (pgg-clear-string passphrase-with-newline))
+ (setq encoded-passphrase-with-new-line passphrase-with-newline
+ passphrase-with-newline nil))
+ (process-send-string process encoded-passphrase-with-new-line))
+ (process-send-region process start end)
+ (process-send-eof process)
+ (while (eq 'run (process-status process))
+ (accept-process-output process 5))
+ ;; Accept any remaining pending output coming after the
+ ;; status change.
+ (accept-process-output process 5)
+ (setq status (process-status process)
+ exit-status (process-exit-status process))
+ (delete-process process)
+ (with-current-buffer (get-buffer-create output-buffer)
+ (buffer-disable-undo)
+ (erase-buffer)
+ (if (file-exists-p output-file-name)
(let ((coding-system-for-read (if pgg-text-mode
'raw-text
'binary)))
- (insert-file-contents output-file-name))
- (when (and (fboundp 'set-buffer-multibyte)
- (subrp (symbol-function 'set-buffer-multibyte))
- (not enable-multibyte-characters))
- (if (zerop (buffer-size))
- (set-buffer-multibyte t)
- (insert (pgg-string-to-multibyte
- (prog1
- (buffer-string)
- (erase-buffer)
- (set-buffer-multibyte t))))))
- (delete-file output-file-name))))
- (kill-buffer (process-buffer process)))))
-
-(defun pgg-gpg-wait-for-status (process status-list)
- (with-current-buffer (process-buffer process)
- (setq pgg-gpg-pending-status-list status-list)
- (while (and (eq (process-status process) 'run)
- pgg-gpg-pending-status-list)
- (accept-process-output process 1))))
-
-(defun pgg-gpg-wait-for-completion (process)
- (process-send-eof process)
- (while (eq (process-status process) 'run)
- ;; We can't use accept-process-output instead of sit-for here
- ;; because it may cause an interrupt during the sentinel execution.
- (sit-for 0.1)))
-
-(defun pgg-gpg-status-USERID_HINT (process line)
- (if (string-match "\\`USERID_HINT \\([^ ]+\\) \\(.*\\)" line)
- (let* ((key-id (match-string 1 line))
- (user-id (match-string 2 line))
- (entry (assoc key-id pgg-gpg-user-id-alist)))
- (if entry
- (setcdr entry user-id)
- (setq pgg-gpg-user-id-alist (cons (cons key-id user-id)
- pgg-gpg-user-id-alist))))))
-
-(defun pgg-gpg-status-NEED_PASSPHRASE (process line)
- (if (string-match "\\`NEED_PASSPHRASE \\([^ ]+\\)" line)
- (setq pgg-gpg-key-id (match-string 1 line))))
-
-(defun pgg-gpg-status-NEED_PASSPHRASE_SYM (process line)
- (setq pgg-gpg-key-id 'SYM))
-
-(defun pgg-gpg-status-NEED_PASSPHRASE_PIN (process line)
- (setq pgg-gpg-key-id 'PIN))
-
-(defun pgg-gpg-status-GET_HIDDEN (process line)
- (let ((entry (assoc pgg-gpg-key-id pgg-gpg-user-id-alist)))
- (if (setq pgg-gpg-passphrase
- (if (eq pgg-gpg-key-id 'SYM)
- (pgg-read-passphrase
- "GnuPG passphrase for symmetric encryption: ")
- (pgg-read-passphrase
- (format "GnuPG passphrase for %s: "
- (if entry
- (cdr entry)
- pgg-gpg-key-id))
- (if (eq pgg-gpg-key-id 'PIN)
- &nb
projects / gnus / blobdiff