;;; pgg-gpg.el --- GnuPG support for PGG.
-;; Copyright (C) 1999 Daiki Ueno
+;; Copyright (C) 1999,2000 Daiki Ueno
;; Author: Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
;; Created: 1999/10/28
:type 'string)
(defcustom pgg-gpg-shell-file-name "/bin/sh"
- "The GnuPG executable."
+ "File name to load inferior shells from. Bourne shell or its equivalent
+\(not tcsh) is needed for \"2>\"."
+ :group 'pgg-gpg
+ :type 'string)
+
+(defcustom pgg-gpg-shell-command-switch "-c"
+ "Switch used to have the shell execute its command line argument."
:group 'pgg-gpg
:type 'string)
:type 'string)
(eval-and-compile
- (luna-define-class pgg-scheme-gpg (pgg-scheme))
- )
-
+ (luna-define-class pgg-scheme-gpg (pgg-scheme)))
+
(defvar pgg-gpg-user-id nil
"GnuPG ID of your default identity.")
(list (concat "2>" errors-file-name)
(concat "3>" status-file-name))))
(shell-file-name pgg-gpg-shell-file-name)
+ (shell-command-switch pgg-gpg-shell-command-switch)
(output-buffer pgg-output-buffer)
(errors-buffer pgg-errors-buffer)
(status-buffer pgg-status-buffer)
(with-current-buffer (get-buffer-create output-buffer)
(buffer-disable-undo)
(erase-buffer))
- (setq process
- (apply #'start-process-shell-command "*GnuPG*" output-buffer
- program args))
- (set-process-sentinel process 'ignore)
+ (as-binary-process
+ (setq process
+ (apply #'start-process-shell-command "*GnuPG*" output-buffer
+ program args)))
+ (set-process-sentinel process #'ignore)
(when passphrase
(process-send-string process (concat passphrase "\n")))
(process-send-region process start end)
exit-status (process-exit-status process))
(delete-process process)
(with-current-buffer output-buffer
- (goto-char (point-min))
- (while (search-forward "\r$" nil t)
- (replace-match ""))
+ (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)
(delete-file status-file-name)
(if (and process (eq 'run (process-status process)))
- (interrupt-process process))
- )
- ))
+ (interrupt-process process)))))
-(luna-define-method lookup-key-string ((scheme pgg-scheme-gpg)
- string &optional type)
+(luna-define-method pgg-scheme-lookup-key ((scheme pgg-scheme-gpg)
+ string &optional type)
(let ((args (list "--with-colons" "--no-greeting" "--batch"
(if type "--list-secret-keys" "--list-keys")
string)))
(with-current-buffer (get-buffer-create pgg-output-buffer)
(buffer-disable-undo)
(erase-buffer)
- (apply #'call-process pgg-gpg-program nil t args)
+ (apply #'call-process pgg-gpg-program nil t nil args)
(goto-char (point-min))
(when (re-search-forward "^\\(sec\\|pub\\):" nil t)
(substring
(buffer-substring (match-end 0)
(progn (end-of-line)(point)))
":"))
- 8)))
- ))
+ 8)))))
-(luna-define-method encrypt-region ((scheme pgg-scheme-gpg)
- start end recipients)
- (let* ((pgg-gpg-user-id pgg-default-user-id)
- (passphrase
- (pgg-read-passphrase
- (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
- (luna-send scheme 'lookup-key-string
- scheme pgg-gpg-user-id 'encrypt)))
+(luna-define-method pgg-scheme-encrypt-region ((scheme pgg-scheme-gpg)
+ start end recipients)
+ (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
(args
- `("--batch" "--armor" "--textmode" "--always-trust" "--encrypt"
+ `("--batch" "--armor" "--always-trust" "--encrypt"
,@(if recipients
(apply #'append
(mapcar (lambda (rcpt)
(list "--remote-user"
(concat "\"" rcpt "\"")))
- recipients))))))
- (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
+ (append recipients
+ (if pgg-encrypt-for-me
+ (list pgg-gpg-user-id)))))))))
+ (pgg-as-lbt start end 'CRLF
+ (pgg-gpg-process-region start end nil pgg-gpg-program args))
(pgg-process-when-success
- (let ((packet
- (cdr (assq 1 (pgg-parse-armor-region
- (point-min)(point-max))))))
- (pgg-add-passphrase-cache
- (cdr (assq 'key-identifier packet))
- passphrase)))
- ))
+ (pgg-convert-lbt-region (point-min)(point-max) 'LF))))
-(luna-define-method decrypt-region ((scheme pgg-scheme-gpg)
- start end)
- (let* ((pgg-gpg-user-id pgg-default-user-id)
+(luna-define-method pgg-scheme-decrypt-region ((scheme pgg-scheme-gpg)
+ start end)
+ (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
(passphrase
(pgg-read-passphrase
(format "GnuPG passphrase for %s: " pgg-gpg-user-id)
- (luna-send scheme 'lookup-key-string
- scheme pgg-gpg-user-id 'encrypt)))
+ (pgg-scheme-lookup-key scheme pgg-gpg-user-id 'encrypt)))
(args '("--batch" "--decrypt")))
(pgg-gpg-process-region start end passphrase pgg-gpg-program args)
- (pgg-process-when-success nil)
- ))
+ (pgg-process-when-success nil)))
-(luna-define-method sign-region ((scheme pgg-scheme-gpg)
- start end &optional cleartext)
- (let* ((pgg-gpg-user-id pgg-default-user-id)
+(luna-define-method pgg-scheme-sign-region ((scheme pgg-scheme-gpg)
+ start end &optional cleartext)
+ (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
(passphrase
(pgg-read-passphrase
(format "GnuPG passphrase for %s: " pgg-gpg-user-id)
- (luna-send scheme 'lookup-key-string
- scheme pgg-gpg-user-id 'sign)))
+ (pgg-scheme-lookup-key scheme pgg-gpg-user-id 'sign)))
(args
(list (if cleartext "--clearsign" "--detach-sign")
"--armor" "--batch" "--verbose"
- "--local-user" pgg-gpg-user-id)))
- (goto-char start)
- (setq end (set-marker (make-marker) (point-max)))
- (while (progn (end-of-line) (> (marker-position end) (point)))
- (insert "\r")
- (forward-line 1))
- (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
- (goto-char start)
- (while (re-search-forward "\r$" end t)
- (replace-match ""))
+ "--local-user" pgg-gpg-user-id))
+ (inhibit-read-only t)
+ buffer-read-only)
+ (pgg-as-lbt start end 'CRLF
+ (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
(pgg-process-when-success
- (goto-char (point-min))
- (while (re-search-forward "\r$" end t)
- (replace-match ""))
+ (pgg-convert-lbt-region (point-min)(point-max) 'LF)
(when (re-search-forward "^-+BEGIN PGP SIGNATURE" nil t);XXX
(let ((packet
(cdr (assq 2 (pgg-parse-armor-region
(progn (beginning-of-line 2)
(point))
(point-max))))))
- (pgg-add-passphrase-cache
- (cdr (assq 'key-identifier packet))
- passphrase))))
- ))
+ (if pgg-cache-passphrase
+ (pgg-add-passphrase-cache
+ (cdr (assq 'key-identifier packet))
+ passphrase)))))))
-(luna-define-method verify-region ((scheme pgg-scheme-gpg)
- start end &optional signature)
+(luna-define-method pgg-scheme-verify-region ((scheme pgg-scheme-gpg)
+ start end &optional signature)
(let ((args '("--batch" "--verify")))
(when (stringp signature)
(setq args (append args (list signature))))
(pgg-gpg-process-region start end nil pgg-gpg-program args)
(save-excursion
+ (set-buffer pgg-errors-buffer)
+ (goto-char (point-min))
+ (while (re-search-forward "^gpg: " nil t)
+ (replace-match ""))
+ (goto-char (point-min))
+ (let ((case-fold-search t))
+ (while (re-search-forward "^warning: " nil t)
+ (delete-region (match-beginning 0)
+ (progn (beginning-of-line 2) (point)))))
(set-buffer pgg-status-buffer)
(goto-char (point-min))
- (when (re-search-forward "^\\[GNUPG:] +GOODSIG +" nil t)
- (set-buffer pgg-errors-buffer)
- (goto-char (point-min))
- (while (re-search-forward "^gpg: " nil t)
- (replace-match ""))
- (goto-char (point-min))
- (let ((case-fold-search t))
- (while (re-search-forward "^warning: " nil t)
- (delete-region (match-beginning 0)
- (progn (beginning-of-line 2) (point)))))
- (append-to-buffer pgg-output-buffer
- (point-min)(point-max))
- t))
- ))
+ (if (re-search-forward "^\\[GNUPG:] +GOODSIG +" nil t)
+ (progn
+ (set-buffer pgg-output-buffer)
+ (insert-buffer-substring pgg-errors-buffer)
+ t)
+ nil))))
-(luna-define-method insert-key ((scheme pgg-scheme-gpg))
- (let* ((pgg-gpg-user-id pgg-default-user-id)
+(luna-define-method pgg-scheme-insert-key ((scheme pgg-scheme-gpg))
+ (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
(args (list "--batch" "--export" "--armor"
(concat "\"" pgg-gpg-user-id "\""))))
(pgg-gpg-process-region (point)(point) nil pgg-gpg-program args)
- (insert-buffer-substring pgg-output-buffer)
- ))
+ (insert-buffer-substring pgg-output-buffer)))
-(luna-define-method snarf-keys-region ((scheme pgg-scheme-gpg)
- start end)
+(luna-define-method pgg-scheme-snarf-keys-region ((scheme pgg-scheme-gpg)
+ start end)
(let ((args '("--import" "--batch" "-")) status)
(pgg-gpg-process-region start end nil pgg-gpg-program args)
(set-buffer pgg-status-buffer)
"\tSecret keys are imported.\n")))
(append-to-buffer pgg-output-buffer
(point-min)(point-max))
- (with-current-buffer pgg-output-buffer
- (if (zerop (buffer-size)) nil t))
- ))
+ (pgg-process-when-success nil)))
(provide 'pgg-gpg)
;;; pgg-gpg.el ends here
-
projects / elisp / semi.git / blobdiff