;;; Commentary:
-;; RCS: $Id: mml1991.el,v 6.3 2001/12/18 04:13:29 huber Exp $
+;; RCS: $Id: mml1991.el,v 6.15 2002/10/10 00:54:59 jas Exp $
;;; Code:
'((mailcrypt mml1991-mailcrypt-sign
mml1991-mailcrypt-encrypt)
(gpg mml1991-gpg-sign
- mml1991-gpg-encrypt))
- "Alist of PGP/MIME functions.")
+ mml1991-gpg-encrypt)
+ (pgg mml1991-pgg-sign
+ mml1991-pgg-encrypt))
+ "Alist of PGP functions.")
;;; mailcrypt wrapper
(defun mml1991-mailcrypt-sign (cont)
(let ((text (current-buffer))
- headers signature
- (result-buffer (get-buffer-create "*GPG Result*")))
+ headers signature
+ (result-buffer (get-buffer-create "*GPG Result*")))
;; Save MIME Content[^ ]+: headers from signing
(goto-char (point-min))
(while (looking-at "^Content[^ ]+:") (forward-line))
(if (> (point) (point-min))
- (progn
- (setq headers (buffer-substring (point-min) (point)))
- (kill-region (point-min) (point))))
+ (progn
+ (setq headers (buffer-substring (point-min) (point)))
+ (kill-region (point-min) (point))))
(goto-char (point-max))
(unless (bolp)
(insert "\n"))
(insert-buffer signature)
(goto-char (point-max)))))
-(defun mml1991-mailcrypt-encrypt (cont)
+(defun mml1991-mailcrypt-encrypt (cont &optional sign)
(let ((text (current-buffer))
+ (mc-pgp-always-sign
+ (or mc-pgp-always-sign
+ sign
+ (eq t (or (message-options-get 'message-sign-encrypt)
+ (message-options-set
+ 'message-sign-encrypt
+ (or (y-or-n-p "Sign the message? ")
+ 'not))))
+ 'never))
cipher
- (result-buffer (get-buffer-create "*GPG Result*")))
+ (result-buffer (get-buffer-create "*GPG Result*")))
;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
(goto-char (point-min))
(while (looking-at "^Content[^ ]+:") (forward-line))
(if (> (point) (point-min))
- (progn
- (kill-region (point-min) (point))))
+ (progn
+ (kill-region (point-min) (point))))
(mm-with-unibyte-current-buffer-mule4
(with-temp-buffer
(setq cipher (current-buffer))
(while (re-search-forward "\r+$" nil t)
(replace-match "" t t))
(set-buffer text)
- (kill-region (point-min) (point-max))
+ (kill-region (point-min) (point-max))
;;(insert "Content-Type: application/pgp-encrypted\n\n")
;;(insert "Version: 1\n\n")
- (insert "\n")
+ (insert "\n")
(insert-buffer cipher)
(goto-char (point-max))))))
(defun mml1991-gpg-sign (cont)
(let ((text (current-buffer))
- headers signature
- (result-buffer (get-buffer-create "*GPG Result*")))
+ headers signature
+ (result-buffer (get-buffer-create "*GPG Result*")))
;; Save MIME Content[^ ]+: headers from signing
(goto-char (point-min))
(while (looking-at "^Content[^ ]+:") (forward-line))
(if (> (point) (point-min))
- (progn
- (setq headers (buffer-substring (point-min) (point)))
- (kill-region (point-min) (point))))
+ (progn
+ (setq headers (buffer-substring (point-min) (point)))
+ (kill-region (point-min) (point))))
(goto-char (point-max))
(unless (bolp)
(insert "\n"))
(quoted-printable-decode-region (point-min) (point-max))
(with-temp-buffer
(unless (gpg-sign-cleartext text (setq signature (current-buffer))
- result-buffer
- nil
- (message-options-get 'message-sender))
+ result-buffer
+ nil
+ (message-options-get 'message-sender))
(unless (> (point-max) (point-min))
(pop-to-buffer result-buffer)
(error "Sign error")))
(insert-buffer signature)
(goto-char (point-max)))))
-(defun mml1991-gpg-encrypt (cont)
+(defun mml1991-gpg-encrypt (cont &optional sign)
(let ((text (current-buffer))
cipher
- (result-buffer (get-buffer-create "*GPG Result*")))
+ (result-buffer (get-buffer-create "*GPG Result*")))
;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
(goto-char (point-min))
(while (looking-at "^Content[^ ]+:") (forward-line))
(if (> (point) (point-min))
- (progn
- (kill-region (point-min) (point))))
+ (progn
+ (kill-region (point-min) (point))))
(mm-with-unibyte-current-buffer-mule4
(with-temp-buffer
- (unless (gpg-sign-encrypt
- text (setq cipher (current-buffer))
- result-buffer
- (split-string
- (or
- (message-options-get 'message-recipients)
- (message-options-set 'message-recipients
- (read-string "Recipients: ")))
- "[ \f\t\n\r\v,]+")
- nil
- (message-options-get 'message-sender)
- t t) ; armor & textmode
- (unless (> (point-max) (point-min))
- (pop-to-buffer result-buffer)
- (error "Encrypt error")))
+ (flet ((gpg-encrypt-func
+ (sign plaintext ciphertext result recipients &optional
+ passphrase sign-with-key armor textmode)
+ (if sign
+ (gpg-sign-encrypt
+ plaintext ciphertext result recipients passphrase
+ sign-with-key armor textmode)
+ (gpg-encrypt
+ plaintext ciphertext result recipients passphrase
+ armor textmode))))
+ (unless (gpg-encrypt-func
+ sign
+ text (setq cipher (current-buffer))
+ result-buffer
+ (split-string
+ (or
+ (message-options-get 'message-recipients)
+ (message-options-set 'message-recipients
+ (read-string "Recipients: ")))
+ "[ \f\t\n\r\v,]+")
+ nil
+ (message-options-get 'message-sender)
+ t t) ; armor & textmode
+ (unless (> (point-max) (point-min))
+ (pop-to-buffer result-buffer)
+ (error "Encrypt error"))))
(goto-char (point-min))
(while (re-search-forward "\r+$" nil t)
(replace-match "" t t))
(set-buffer text)
- (kill-region (point-min) (point-max))
+ (kill-region (point-min) (point-max))
;;(insert "Content-Type: application/pgp-encrypted\n\n")
;;(insert "Version: 1\n\n")
- (insert "\n")
+ (insert "\n")
(insert-buffer cipher)
(goto-char (point-max))))))
+;; pgg wrapper
+
+(defvar pgg-output-buffer)
+(defvar pgg-errors-buffer)
+
+(defun mml1991-pgg-sign (cont)
+ (let (headers)
+ ;; Don't sign headers.
+ (goto-char (point-min))
+ (while (not (looking-at "^$"))
+ (forward-line))
+ (unless (eobp) ;; no headers?
+ (setq headers (buffer-substring (point-min) (point)))
+ (forward-line) ;; skip header/body separator
+ (kill-region (point-min) (point)))
+ (quoted-printable-decode-region (point-min) (point-max))
+ (unless (let ((pgg-default-user-id
+ (or (message-options-get 'message-sender)
+ pgg-default-user-id)))
+ (pgg-sign-region (point-min) (point-max) t))
+ (pop-to-buffer pgg-errors-buffer)
+ (error "Encrypt error"))
+ (kill-region (point-min) (point-max))
+ (insert-buffer pgg-output-buffer)
+ (goto-char (point-min))
+ (while (re-search-forward "\r+$" nil t)
+ (replace-match "" t t))
+ (quoted-printable-encode-region (point-min) (point-max))
+ (goto-char (point-min))
+ (if headers (insert headers))
+ (insert "\n")
+ t))
+
+(defun mml1991-pgg-encrypt (cont &optional sign)
+ (let (headers)
+ ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
+ (goto-char (point-min))
+ (while (looking-at "^Content[^ ]+:") (forward-line))
+ (if (> (point) (point-min))
+ (progn
+ (kill-region (point-min) (point))))
+ (unless (pgg-encrypt-region
+ (point-min) (point-max)
+ (split-string
+ (or
+ (message-options-get 'message-recipients)
+ (message-options-set 'message-recipients
+ (read-string "Recipients: ")))
+ "[ \f\t\n\r\v,]+")
+ sign)
+ (pop-to-buffer pgg-errors-buffer)
+ (error "Encrypt error"))
+ (kill-region (point-min) (point-max))
+ ;;(insert "Content-Type: application/pgp-encrypted\n\n")
+ ;;(insert "Version: 1\n\n")
+ (insert "\n")
+ (insert-buffer pgg-output-buffer)
+ t))
+
;;;###autoload
-(defun mml1991-encrypt (cont)
+(defun mml1991-encrypt (cont &optional sign)
(let ((func (nth 2 (assq mml1991-use mml1991-function-alist))))
(if func
- (funcall func cont)
+ (funcall func cont sign)
(error "Cannot find encrypt function"))))
;;;###autoload
;; Local Variables:
;; coding: iso-8859-1
-;; buffer-file-coding-system: iso-8859-1
;; End:
;;; mml1991.el ends here