projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add hooks for gcc handling
[gnus]
/
lisp
/
pgg-pgp.el
diff --git
a/lisp/pgg-pgp.el
b/lisp/pgg-pgp.el
index
0d7dfac
..
8e42779
100644
(file)
--- a/
lisp/pgg-pgp.el
+++ b/
lisp/pgg-pgp.el
@@
-1,17
+1,19
@@
;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
-;; Copyright (C) 1999
, 2000, 2003
Free Software Foundation, Inc.
+;; Copyright (C) 1999
-2000, 2002-2012
Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/11/02
;; Keywords: PGP, OpenPGP
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/11/02
;; Keywords: PGP, OpenPGP
+;; Package: pgg
+;; Obsolete-since: 24.1
;; This file is part of GNU Emacs.
;; 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
;; 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 Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+21,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
;;; Code:
@@
-30,7
+30,7
@@
(require 'pgg))
(defgroup pgg-pgp ()
(require 'pgg))
(defgroup pgg-pgp ()
- "PGP 2.* and 6.* interface"
+ "PGP 2.* and 6.* interface
.
"
:group 'pgg)
(defcustom pgg-pgp-program "pgp"
:group 'pgg)
(defcustom pgg-pgp-program "pgp"
@@
-62,9
+62,9
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(defun pgg-pgp-process-region (start end passphrase program args)
(let* ((errors-file-name (pgg-make-temp-file "pgg-errors"))
(args
(defun pgg-pgp-process-region (start end passphrase program args)
(let* ((errors-file-name (pgg-make-temp-file "pgg-errors"))
(args
- (
append
args
+ (
concat
args
pgg-pgp-extra-args
pgg-pgp-extra-args
-
(list (concat "2>" errors-file-name)
)))
+
" 2>" (shell-quote-argument errors-file-name
)))
(shell-file-name pgg-pgp-shell-file-name)
(shell-command-switch pgg-pgp-shell-command-switch)
(process-environment process-environment)
(shell-file-name pgg-pgp-shell-file-name)
(shell-command-switch pgg-pgp-shell-command-switch)
(process-environment process-environment)
@@
-82,9
+82,8
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(let ((coding-system-for-read 'binary)
(coding-system-for-write 'binary))
(setq process
(let ((coding-system-for-read 'binary)
(coding-system-for-write 'binary))
(setq process
- (apply #'funcall
- #'start-process-shell-command "*PGP*" output-buffer
- program args)))
+ (start-process-shell-command "*PGP*" output-buffer
+ (concat program " " args))))
(set-process-sentinel process #'ignore)
(when passphrase
(process-send-string process (concat passphrase "\n")))
(set-process-sentinel process #'ignore)
(when passphrase
(process-send-string process (concat passphrase "\n")))
@@
-131,45
+130,60
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(buffer-substring (point)(progn (end-of-line) (point)))))
2))))))
(buffer-substring (point)(progn (end-of-line) (point)))))
2))))))
-(defun pgg-pgp-encrypt-region (start end recipients)
+(defun pgg-pgp-encrypt-region (start end recipients
&optional sign passphrase
)
"Encrypt the current region between START and END."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
"Encrypt the current region between START and END."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
+ (passphrase (or passphrase
+ (when sign
+ (pgg-read-passphrase
+ (format "PGP passphrase for %s: "
+ pgg-pgp-user-id)
+ pgg-pgp-user-id))))
(args
(args
- `("+encrypttoself=off +verbose=1" "+batchmode"
- "+language=us" "-fate"
- ,@(if recipients
- (mapcar (lambda (rcpt) (concat "\"" rcpt "\""))
- (append recipients
- (if pgg-encrypt-for-me
- (list pgg-pgp-user-id))))))))
+ (concat
+ "+encrypttoself=off +verbose=1 +batchmode +language=us -fate "
+ (if (or recipients pgg-encrypt-for-me)
+ (mapconcat 'shell-quote-argument
+ (append recipients
+ (if pgg-encrypt-for-me
+ (list pgg-pgp-user-id))) " "))
+ (if sign (concat " -s -u " (shell-quote-argument pgg-pgp-user-id))))))
(pgg-pgp-process-region start end nil pgg-pgp-program args)
(pgg-process-when-success nil)))
(pgg-pgp-process-region start end nil pgg-pgp-program args)
(pgg-process-when-success nil)))
-(defun pgg-pgp-decrypt-region (start end)
- "Decrypt the current region between START and END."
+(defun pgg-pgp-decrypt-region (start end &optional passphrase)
+ "Decrypt the current region between START and END.
+
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt))
(passphrase
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt))
(passphrase
- (pgg-read-passphrase
- (format "PGP passphrase for %s: " pgg-pgp-user-id) key))
+ (or passphrase
+ (pgg-read-passphrase
+ (format "PGP passphrase for %s: " pgg-pgp-user-id) key)))
(args
(args
-
'("+verbose=1" "+batchmode" "+language=us" "-f")
))
+
"+verbose=1 +batchmode +language=us -f"
))
(pgg-pgp-process-region start end passphrase pgg-pgp-program args)
(pgg-process-when-success
(if pgg-cache-passphrase
(pgg-pgp-process-region start end passphrase pgg-pgp-program args)
(pgg-process-when-success
(if pgg-cache-passphrase
- (pgg-add-passphrase-cache key passphrase)))))
+ (pgg-add-passphrase-to-cache key passphrase)))))
+
+(defun pgg-pgp-sign-region (start end &optional clearsign passphrase)
+ "Make detached signature from text between START and END.
-(defun pgg-pgp-sign-region (start end &optional clearsign)
-
"Make detached signature from text between START and END
."
+If optional PASSPHRASE is not specified, it will be obtained from the
+
passphrase cache or user
."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(passphrase
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(passphrase
- (pgg-read-passphrase
- (format "PGP passphrase for %s: " pgg-pgp-user-id)
- (pgg-pgp-lookup-key pgg-pgp-user-id 'sign)))
+ (or passphrase
+ (pgg-read-passphrase
+ (format "PGP passphrase for %s: " pgg-pgp-user-id)
+ (pgg-pgp-lookup-key pgg-pgp-user-id 'sign))))
(args
(args
- (
lis
t (if clearsign "-fast" "-fbast")
- "
+verbose=1" "+language=us" "
+batchmode"
- "
-u" pgg-pgp-user-id
)))
+ (
conca
t (if clearsign "-fast" "-fbast")
+ "
+verbose=1 +language=us
+batchmode"
+ "
-u " (shell-quote-argument pgg-pgp-user-id)
)))
(pgg-pgp-process-region start end passphrase pgg-pgp-program args)
(pgg-process-when-success
(goto-char (point-min))
(pgg-pgp-process-region start end passphrase pgg-pgp-program args)
(pgg-process-when-success
(goto-char (point-min))
@@
-180,14
+194,14
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(point))
(point-max))))))
(if pgg-cache-passphrase
(point))
(point-max))))))
(if pgg-cache-passphrase
- (pgg-add-passphrase-cache
+ (pgg-add-passphrase-
to-
cache
(cdr (assq 'key-identifier packet))
passphrase)))))))
(defun pgg-pgp-verify-region (start end &optional signature)
"Verify region between START and END as the detached signature SIGNATURE."
(let* ((orig-file (pgg-make-temp-file "pgg"))
(cdr (assq 'key-identifier packet))
passphrase)))))))
(defun pgg-pgp-verify-region (start end &optional signature)
"Verify region between START and END as the detached signature SIGNATURE."
(let* ((orig-file (pgg-make-temp-file "pgg"))
- (args
'("+verbose=1" "+batchmode" "+language=us")
)
+ (args
"+verbose=1 +batchmode +language=us"
)
(orig-mode (default-file-modes)))
(unwind-protect
(progn
(orig-mode (default-file-modes)))
(unwind-protect
(progn
@@
-199,8
+213,8
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(if (stringp signature)
(progn
(copy-file signature (setq signature (concat orig-file ".asc")))
(if (stringp signature)
(progn
(copy-file signature (setq signature (concat orig-file ".asc")))
- (setq args (
append args (list signature orig-file
))))
-
(setq args (append args (list orig-file)
)))
+ (setq args (
concat args " " (shell-quote-argument signature)
))))
+
(setq args (concat args " " (shell-quote-argument orig-file
)))
(pgg-pgp-process-region (point)(point) nil pgg-pgp-program args)
(delete-file orig-file)
(if signature (delete-file signature))
(pgg-pgp-process-region (point)(point) nil pgg-pgp-program args)
(delete-file orig-file)
(if signature (delete-file signature))
@@
-220,8
+234,8
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
"Insert public key at point."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(args
"Insert public key at point."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(args
- (
list "+verbose=1" "+batchmode" "+language=us" "-kxaf
"
-
(concat "\"" pgg-pgp-user-id "\""
))))
+ (
concat "+verbose=1 +batchmode +language=us -kxaf
"
+
(shell-quote-argument pgg-pgp-user-id
))))
(pgg-pgp-process-region (point)(point) nil pgg-pgp-program args)
(insert-buffer-substring pgg-output-buffer)))
(pgg-pgp-process-region (point)(point) nil pgg-pgp-program args)
(insert-buffer-substring pgg-output-buffer)))
@@
-230,8
+244,8
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(key-file (pgg-make-temp-file "pgg"))
(args
(let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(key-file (pgg-make-temp-file "pgg"))
(args
- (
list "+verbose=1" "+batchmode" "+language=us" "-kaf
"
-
key-file
)))
+ (
concat "+verbose=1 +batchmode +language=us -kaf
"
+
(shell-quote-argument key-file)
)))
(let ((coding-system-for-write 'raw-text-dos))
(write-region start end key-file))
(pgg-pgp-process-region start end nil pgg-pgp-program args)
(let ((coding-system-for-write 'raw-text-dos))
(write-region start end key-file))
(pgg-pgp-process-region start end nil pgg-pgp-program args)
@@
-240,5
+254,4
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(provide 'pgg-pgp)
(provide 'pgg-pgp)
-;;; arch-tag: 076b7801-37b2-49a6-97c3-218fdecde33c
;;; pgg-pgp.el ends here
;;; pgg-pgp.el ends here