X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-pgp.el;h=ba0c4005da61e3a4f6faffdc00491bd2c6a46f8d;hb=5c2e9049f37c2a97c8c3b04d4c9c68ef86a3560d;hp=9193660c5eb17a6cccd9b4a105bc5f1f966256d1;hpb=f88c828889eba80c7ca4aaa6f34dba277668d5f0;p=elisp%2Fsemi.git diff --git a/pgg-pgp.el b/pgg-pgp.el index 9193660..ba0c400 100644 --- a/pgg-pgp.el +++ b/pgg-pgp.el @@ -1,8 +1,8 @@ ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG. -;; Copyright (C) 1999 Daiki Ueno +;; Copyright (C) 1999,2000 Free Software Foundation, Inc. -;; Author: Daiki Ueno +;; Author: Daiki Ueno ;; Created: 1999/11/02 ;; Keywords: PGP, OpenPGP @@ -25,20 +25,21 @@ ;;; Code: +(require 'mel) ; binary-to-text-funcall, binary-write-decoded-region (eval-when-compile (require 'pgg)) (defgroup pgg-pgp () "PGP 2.* and 6.* interface" :group 'pgg) -(defcustom pgg-pgp-program "pgp" +(defcustom pgg-pgp-program "pgp" "PGP 2.* and 6.* executable." :group 'pgg-pgp :type 'string) (defcustom pgg-pgp-shell-file-name "/bin/sh" - "File name to load inferior shells from. Bourne shell or its equivalent -\(not tcsh) is needed for \"2>\"." + "File name to load inferior shells from. +Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." :group 'pgg-pgp :type 'string) @@ -53,11 +54,10 @@ :type 'string) (eval-and-compile - (luna-define-class pgg-scheme-pgp (pgg-scheme)) - ) - + (luna-define-class pgg-scheme-pgp (pgg-scheme))) + (defvar pgg-pgp-user-id nil - "GnuPG ID of your default identity.") + "PGP ID of your default identity.") (defvar pgg-scheme-pgp-instance nil) @@ -68,15 +68,14 @@ (luna-make-entity 'pgg-scheme-pgp)))) (defun pgg-pgp-process-region (start end passphrase program args) - (let* ((errors-file-name - (concat temporary-file-directory - (make-temp-name "pgg-errors"))) - (args - (append args + (let* ((errors-file-name (make-temp-file "pgg-errors")) + (args + (append args pgg-pgp-extra-args (list (concat "2>" errors-file-name)))) (shell-file-name pgg-pgp-shell-file-name) (shell-command-switch pgg-pgp-shell-command-switch) + (process-environment process-environment) (output-buffer pgg-output-buffer) (errors-buffer pgg-errors-buffer) (process-connection-type nil) @@ -86,138 +85,123 @@ (erase-buffer)) (when passphrase (setenv "PGPPASSFD" "0")) - (as-binary-process - (setq process - (apply #'start-process-shell-command "*PGP*" output-buffer - program args))) - (set-process-sentinel process 'ignore) - (when passphrase - (process-send-string process (concat passphrase "\n"))) - (process-send-region process start end) - (process-send-eof process) - (while (eq 'run (process-status process)) - (accept-process-output process 5)) - (setq status (process-status process) - exit-status (process-exit-status process)) - (delete-process process) - (with-current-buffer output-buffer - (pgg-convert-lbt-region (point-min)(point-max) 'LF) - - (if (memq status '(stop signal)) - (error "%s exited abnormally: '%s'" program exit-status)) - (if (= 127 exit-status) - (error "%s could not be found" program)) - - (set-buffer (get-buffer-create errors-buffer)) - (buffer-disable-undo) - (erase-buffer) - (insert-file-contents errors-file-name) - (delete-file errors-file-name) - + (unwind-protect + (progn + (setq process + (apply #'binary-funcall + #'start-process-shell-command "*PGP*" output-buffer + program args)) + (set-process-sentinel process #'ignore) + (when passphrase + (process-send-string process (concat passphrase "\n"))) + (process-send-region process start end) + (process-send-eof process) + (while (eq 'run (process-status process)) + (accept-process-output process 5)) + (setq status (process-status process) + exit-status (process-exit-status process)) + (delete-process process) + (with-current-buffer output-buffer + (pgg-convert-lbt-region (point-min)(point-max) 'LF) + + (if (memq status '(stop signal)) + (error "%s exited abnormally: '%s'" program exit-status)) + (if (= 127 exit-status) + (error "%s could not be found" program)) + + (set-buffer (get-buffer-create errors-buffer)) + (buffer-disable-undo) + (erase-buffer) + (insert-file-contents errors-file-name))) (if (and process (eq 'run (process-status process))) (interrupt-process process)) - ) - )) + (condition-case nil + (delete-file errors-file-name) + (file-error nil))))) -(luna-define-method lookup-key-string ((scheme pgg-scheme-pgp) - string &optional type) +(luna-define-method pgg-scheme-lookup-key ((scheme pgg-scheme-pgp) + string &optional type) (let ((args (list "+batchmode" "+language=en" "-kv" string))) (with-current-buffer (get-buffer-create pgg-output-buffer) (buffer-disable-undo) (erase-buffer) - (apply #'call-process pgg-pgp-program nil t args) + (apply #'call-process pgg-pgp-program nil t nil args) (goto-char (point-min)) (cond ((re-search-forward "^pub\\s +[0-9]+/" nil t);PGP 2.* (buffer-substring (point)(+ 8 (point)))) ((re-search-forward "^Type" nil t);PGP 6.* (beginning-of-line 2) - (substring - (nth 2 (split-string - (buffer-substring (point) - (progn (end-of-line) (point))) - )) - 2)))) - )) + (substring + (nth 2 (split-string + (buffer-substring (point)(progn (end-of-line) (point))))) + 2)))))) -(luna-define-method encrypt-region ((scheme pgg-scheme-pgp) - start end recipients) +(luna-define-method pgg-scheme-encrypt-region ((scheme pgg-scheme-pgp) + start end recipients) (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-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)))))) - )) - (pgg-pgp-process-region start end nil - pgg-pgp-program args) - (pgg-process-when-success nil) - )) + (list pgg-pgp-user-id)))))))) + (pgg-pgp-process-region start end nil pgg-pgp-program args) + (pgg-process-when-success nil))) -(luna-define-method decrypt-region ((scheme pgg-scheme-pgp) - start end) +(luna-define-method pgg-scheme-decrypt-region ((scheme pgg-scheme-pgp) + start end) (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (passphrase - (pgg-read-passphrase + (pgg-read-passphrase (format "PGP passphrase for %s: " pgg-pgp-user-id) - (luna-send scheme 'lookup-key-string - scheme pgg-pgp-user-id 'encrypt))) - (args + (pgg-scheme-lookup-key scheme pgg-pgp-user-id 'encrypt))) + (args '("+verbose=1" "+batchmode" "+language=us" "-f"))) - (pgg-pgp-process-region start end passphrase - pgg-pgp-program args) - (pgg-process-when-success nil) - )) + (pgg-pgp-process-region start end passphrase pgg-pgp-program args) + (pgg-process-when-success nil))) -(luna-define-method sign-region ((scheme pgg-scheme-pgp) - start end &optional clearsign) +(luna-define-method pgg-scheme-sign-region ((scheme pgg-scheme-pgp) + start end &optional clearsign) (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (passphrase - (pgg-read-passphrase + (pgg-read-passphrase (format "PGP passphrase for %s: " pgg-pgp-user-id) - (luna-send scheme 'lookup-key-string - scheme pgg-pgp-user-id 'sign))) - (args + (pgg-scheme-lookup-key scheme pgg-pgp-user-id 'sign))) + (args (list (if clearsign "-fast" "-fbast") "+verbose=1" "+language=us" "+batchmode" "-u" pgg-pgp-user-id))) - (pgg-pgp-process-region start end passphrase - pgg-pgp-program args) + (pgg-pgp-process-region start end passphrase pgg-pgp-program args) (pgg-process-when-success (goto-char (point-min)) (when (re-search-forward "^-+BEGIN PGP" nil t);XXX - (let ((packet - (cdr (assq 2 (pgg-parse-armor-region + (let ((packet + (cdr (assq 2 (pgg-parse-armor-region (progn (beginning-of-line 2) (point)) (point-max)))))) (if pgg-cache-passphrase - (pgg-add-passphrase-cache + (pgg-add-passphrase-cache (cdr (assq 'key-identifier packet)) - passphrase))))) - )) + passphrase))))))) -(luna-define-method verify-region ((scheme pgg-scheme-pgp) - start end &optional signature) - (let* ((basename (expand-file-name "pgg" temporary-file-directory)) - (orig-file (make-temp-name basename)) - (args '("+verbose=1" "+batchmode" "+language=us")) - (orig-mode (default-file-modes))) +(luna-define-method pgg-scheme-verify-region ((scheme pgg-scheme-pgp) + start end &optional signature) + (let ((orig-file (make-temp-file "pgg")) + (args '("+verbose=1" "+batchmode" "+language=us")) + (orig-mode (default-file-modes))) (unwind-protect (progn (set-default-file-modes 448) - (write-region-as-binary start end orig-file) - ) + (binary-write-decoded-region start end orig-file)) (set-default-file-modes orig-mode)) (when (stringp signature) (copy-file signature (setq signature (concat orig-file ".asc"))) - (setq args (append args (list signature orig-file))) - ) - (pgg-pgp-process-region (point-min)(point-max) nil - pgg-pgp-program args) + (setq args (append args (list signature orig-file)))) + (pgg-pgp-process-region (point)(point) nil pgg-pgp-program args) (delete-file orig-file) (if signature (delete-file signature)) (pgg-process-when-success @@ -228,35 +212,30 @@ (progn (beginning-of-line 2) (point))))) (goto-char (point-min)) (when (re-search-forward "^\\.$" nil t) - (delete-region (point-min) + (delete-region (point-min) (progn (beginning-of-line 2) - (point))))) - )) + (point))))))) -(luna-define-method insert-key ((scheme pgg-scheme-pgp)) +(luna-define-method pgg-scheme-insert-key ((scheme pgg-scheme-pgp)) (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (args - (list "+verbose=1" "+batchmode" "+language=us" "-kxaf" + (list "+verbose=1" "+batchmode" "+language=us" "-kxaf" (concat "\"" 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))) -(luna-define-method snarf-keys-region ((scheme pgg-scheme-pgp) - start end) +(luna-define-method pgg-scheme-snarf-keys-region ((scheme pgg-scheme-pgp) + start end) (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) - (basename (expand-file-name "pgg" temporary-file-directory)) - (key-file (make-temp-name basename)) - (args - (list "+verbose=1" "+batchmode" "+language=us" "-kaf" + (key-file (make-temp-file "pgg")) + (args + (list "+verbose=1" "+batchmode" "+language=us" "-kaf" key-file))) - (write-region-as-raw-text-CRLF 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) (delete-file key-file) - (pgg-process-when-success nil) - )) + (pgg-process-when-success nil))) (provide 'pgg-pgp)