projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(message-cite-articles-with-x-no-archive): New
[gnus]
/
lisp
/
mml2015.el
diff --git
a/lisp/mml2015.el
b/lisp/mml2015.el
index
fc3cc50
..
09c9a96
100644
(file)
--- a/
lisp/mml2015.el
+++ b/
lisp/mml2015.el
@@
-1,5
+1,5
@@
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
-;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003
, 2004
Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: PGP MIME MML
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: PGP MIME MML
@@
-36,7
+36,10
@@
(defvar mml2015-use (or
(progn
(ignore-errors
(defvar mml2015-use (or
(progn
(ignore-errors
- (require 'pgg))
+ ;; Avoid the "Recursive load suspected" error
+ ;; in Emacs 21.1.
+ (let ((recursive-load-depth-limit 100))
+ (require 'pgg)))
(and (fboundp 'pgg-sign-region)
'pgg))
(progn
(and (fboundp 'pgg-sign-region)
'pgg))
(progn
@@
-50,7
+53,8
@@
(fboundp 'mc-sign-generic)
(fboundp 'mc-cleanup-recipient-headers)
'mailcrypt)))
(fboundp 'mc-sign-generic)
(fboundp 'mc-cleanup-recipient-headers)
'mailcrypt)))
- "The package used for PGP/MIME.")
+ "The package used for PGP/MIME.
+Valid packages include `pgg', `gpg' and `mailcrypt'.")
;; Something is not RFC2015.
(defvar mml2015-function-alist
;; Something is not RFC2015.
(defvar mml2015-function-alist
@@
-277,8
+281,7
@@
(defun mml2015-mailcrypt-sign (cont)
(mc-sign-generic (message-options-get 'message-sender)
nil nil nil nil)
(defun mml2015-mailcrypt-sign (cont)
(mc-sign-generic (message-options-get 'message-sender)
nil nil nil nil)
- (let ((boundary
- (funcall mml-boundary-function (incf mml-multipart-number)))
+ (let ((boundary (mml-compute-boundary cont))
hash point)
(goto-char (point-min))
(unless (re-search-forward "^-----BEGIN PGP SIGNED MESSAGE-----\r?$" nil t)
hash point)
(goto-char (point-min))
(unless (re-search-forward "^-----BEGIN PGP SIGNED MESSAGE-----\r?$" nil t)
@@
-341,8
+344,7
@@
(goto-char (point-min))
(unless (looking-at "-----BEGIN PGP MESSAGE-----")
(error "Fail to encrypt the message"))
(goto-char (point-min))
(unless (looking-at "-----BEGIN PGP MESSAGE-----")
(error "Fail to encrypt the message"))
- (let ((boundary
- (funcall mml-boundary-function (incf mml-multipart-number))))
+ (let ((boundary (mml-compute-boundary cont)))
(insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n"
boundary))
(insert "\tprotocol=\"application/pgp-encrypted\"\n\n")
(insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n"
boundary))
(insert "\tprotocol=\"application/pgp-encrypted\"\n\n")
@@
-544,8
+546,7
@@
mm-security-handle 'gnus-info "Failed")))
(defun mml2015-gpg-sign (cont)
mm-security-handle 'gnus-info "Failed")))
(defun mml2015-gpg-sign (cont)
- (let ((boundary
- (funcall mml-boundary-function (incf mml-multipart-number)))
+ (let ((boundary (mml-compute-boundary cont))
(text (current-buffer)) signature)
(goto-char (point-max))
(unless (bolp)
(text (current-buffer)) signature)
(goto-char (point-max))
(unless (bolp)
@@
-578,8
+579,7
@@
(goto-char (point-max)))))
(defun mml2015-gpg-encrypt (cont &optional sign)
(goto-char (point-max)))))
(defun mml2015-gpg-encrypt (cont &optional sign)
- (let ((boundary
- (funcall mml-boundary-function (incf mml-multipart-number)))
+ (let ((boundary (mml-compute-boundary cont))
(text (current-buffer))
cipher)
(mm-with-unibyte-current-buffer
(text (current-buffer))
cipher)
(mm-with-unibyte-current-buffer
@@
-807,7
+807,7
@@
(defun mml2015-pgg-sign (cont)
(let ((pgg-errors-buffer mml2015-result-buffer)
(defun mml2015-pgg-sign (cont)
(let ((pgg-errors-buffer mml2015-result-buffer)
- (boundary (
funcall mml-boundary-function (incf mml-multipart-number)
))
+ (boundary (
mml-compute-boundary cont
))
(pgg-default-user-id (or (message-options-get 'mml-sender)
pgg-default-user-id)))
(unless (pgg-sign-region (point-min) (point-max))
(pgg-default-user-id (or (message-options-get 'mml-sender)
pgg-default-user-id)))
(unless (pgg-sign-region (point-min) (point-max))
@@
-829,7
+829,7
@@
(defun mml2015-pgg-encrypt (cont &optional sign)
(let ((pgg-errors-buffer mml2015-result-buffer)
(defun mml2015-pgg-encrypt (cont &optional sign)
(let ((pgg-errors-buffer mml2015-result-buffer)
- (boundary (
funcall mml-boundary-function (incf mml-multipart-number)
)))
+ (boundary (
mml-compute-boundary cont
)))
(unless (pgg-encrypt-region (point-min) (point-max)
(split-string
(or
(unless (pgg-encrypt-region (point-min) (point-max)
(split-string
(or
@@
-918,4
+918,5
@@
(provide 'mml2015)
(provide 'mml2015)
+;;; arch-tag: b04701d5-0b09-44d8-bed8-de901bf435f2
;;; mml2015.el ends here
;;; mml2015.el ends here