(erase-buffer))
(when passphrase
(setenv "PGPPASSFD" "0"))
- (setq process
- (apply #'start-process-shell-command "*PGP*" output-buffer
- program args))
+ (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")))
(luna-define-method encrypt-region ((scheme pgg-scheme-pgp)
start end recipients)
- (let* ((pgg-pgp-user-id pgg-default-user-id)
+ (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
(args
`("+encrypttoself=off +verbose=1" "+batchmode"
"+language=us" "-fate"
(luna-define-method decrypt-region ((scheme pgg-scheme-pgp)
start end)
- (let* ((pgg-pgp-user-id pgg-default-user-id)
+ (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)
(luna-define-method sign-region ((scheme pgg-scheme-pgp)
start end &optional clearsign)
- (let* ((pgg-pgp-user-id pgg-default-user-id)
+ (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)
(args
(list (if clearsign "-fast" "-fbast")
"+verbose=1" "+language=us" "+batchmode"
- "-u" pgg-pgp-user-id))
- (inhibit-read-only t)
- buffer-read-only)
- (pgg-as-lbt start end 'CRLF
- (pgg-pgp-process-region start end passphrase
- pgg-pgp-program args)
- )
+ "-u" pgg-pgp-user-id)))
+ (pgg-pgp-process-region start end passphrase
+ pgg-pgp-program args)
(pgg-process-when-success
- (pgg-convert-lbt-region (point-min)(point-max) 'LF)
(goto-char (point-min))
(when (re-search-forward "^-+BEGIN PGP" nil t);XXX
(let ((packet
(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-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")))
- (write-region-as-binary start end orig-file)
+ (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)
+ )
+ (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)))
))
(luna-define-method insert-key ((scheme pgg-scheme-pgp))
- (let* ((pgg-pgp-user-id pgg-default-user-id)
+ (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 "\""))))
(luna-define-method snarf-keys-region ((scheme pgg-scheme-pgp)
start end)
- (let* ((pgg-pgp-user-id pgg-default-user-id)
+ (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