X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fmml1991.el;h=44efe6da668cf7edca554771f738e4b387cb0518;hp=ef13ffcbd069da9d15bbd17d241ae3982b90f6bb;hb=17f456f97c1659bcdc5935b91a011cdad96b9150;hpb=bfe53b059a0a774b09dd4767696c3f1b8cf96b82

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index ef13ffcbd..44efe6da6 100644
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -1,15 +1,17 @@
-;;; mml-gpg-old.el --- Old PGP message format (RFC 1991) support for MML
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
 
-;; Author: Sascha Lüdecke <sascha@meta-x.de>,
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
+
+;; Author: Sascha Ldecke <sascha@meta-x.de>,
 ;;	Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
 ;; Keywords PGP
 
-;; This file is (not yet) part of GNU Emacs.
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,15 +21,33 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;; RCS: $Id: mml1991.el,v 6.4 2001/12/18 06:26:40 zsh Exp $
-
 ;;; Code:
 
+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
+(eval-when-compile
+  (require 'cl)
+  (require 'mm-util))
+
+(require 'mml-sec)
+
+(defvar mc-pgp-always-sign)
+
+(autoload 'quoted-printable-decode-region "qp")
+(autoload 'quoted-printable-encode-region "qp")
+
+(autoload 'mm-decode-content-transfer-encoding "mm-bodies")
+(autoload 'mm-encode-content-transfer-encoding "mm-bodies")
+(autoload 'message-options-get "message")
+(autoload 'message-options-set "message")
+
 (defvar mml1991-use mml2015-use
   "The package used for PGP.")
 
@@ -35,8 +55,29 @@
   '((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)
+    (epg mml1991-epg-sign
+	 mml1991-epg-encrypt))
+  "Alist of PGP functions.")
+
+(defvar mml1991-verbose mml-secure-verbose
+  "If non-nil, ask the user about the current operation more verbosely.")
+
+(defvar mml1991-cache-passphrase mml-secure-cache-passphrase
+  "If t, cache passphrase.")
+
+(defvar mml1991-passphrase-cache-expiry mml-secure-passphrase-cache-expiry
+  "How many seconds the passphrase is cached.
+Whether the passphrase is cached at all is controlled by
+`mml1991-cache-passphrase'.")
+
+(defvar mml1991-signers nil
+  "A list of your own key ID which will be used to sign a message.")
+
+(defvar mml1991-encrypt-to-self nil
+  "If t, add your own key ID to recipient list when encryption.")
 
 ;;; mailcrypt wrapper
 
@@ -48,22 +89,21 @@
 
 (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))))
+    (unless (bobp)
+      (setq headers (buffer-string))
+      (delete-region (point-min) (point)))
     (goto-char (point-max))
     (unless (bolp)
       (insert "\n"))
     (quoted-printable-decode-region (point-min) (point-max))
     (with-temp-buffer
       (setq signature (current-buffer))
-      (insert-buffer text)
+      (insert-buffer-substring text)
       (unless (mc-sign-generic (message-options-get 'message-sender)
 			       nil nil nil nil)
 	(unless (> (point-max) (point-min))
@@ -74,26 +114,37 @@
 	(replace-match "" t t))
       (quoted-printable-encode-region (point-min) (point-max))
       (set-buffer text)
-      (kill-region (point-min) (point-max))
+      (delete-region (point-min) (point-max))
       (if headers (insert headers))
       (insert "\n")
-      (insert-buffer signature)
+      (insert-buffer-substring signature)
       (goto-char (point-max)))))
 
-(defun mml1991-mailcrypt-encrypt (cont)
+(declare-function mc-encrypt-generic "ext:mc-toplev"
+                  (&optional recipients scheme start end from sign))
+
+(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))))
-    (mm-with-unibyte-current-buffer-mule4
+    (unless (bobp)
+      (delete-region (point-min) (point)))
+    (mm-with-unibyte-current-buffer
       (with-temp-buffer
 	(setq cipher (current-buffer))
-	(insert-buffer text)
+	(insert-buffer-substring text)
 	(unless (mc-encrypt-generic
 		 (or
 		  (message-options-get 'message-recipients)
@@ -110,11 +161,11 @@
 	(while (re-search-forward "\r+$" nil t)
 	  (replace-match "" t t))
 	(set-buffer text)
-        (kill-region (point-min) (point-max))
+	(delete-region (point-min) (point-max))
 	;;(insert "Content-Type: application/pgp-encrypted\n\n")
 	;;(insert "Version: 1\n\n")
-        (insert "\n")
-	(insert-buffer cipher)
+	(insert "\n")
+	(insert-buffer-substring cipher)
 	(goto-char (point-max))))))
 
 ;;; gpg wrapper
@@ -122,26 +173,32 @@
 (eval-and-compile
   (autoload 'gpg-sign-cleartext "gpg"))
 
+(declare-function gpg-sign-encrypt "ext:gpg"
+                  (plaintext ciphertext result recipients &optional
+                             passphrase sign-with-key armor textmode))
+(declare-function gpg-encrypt "ext:gpg"
+                  (plaintext ciphertext result recipients &optional
+                             passphrase armor textmode))
+
 (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))))
+    (unless (bobp)
+      (setq headers (buffer-string))
+      (delete-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")))
@@ -150,55 +207,304 @@
 	(replace-match "" t t))
       (quoted-printable-encode-region (point-min) (point-max))
       (set-buffer text)
-      (kill-region (point-min) (point-max))
+      (delete-region (point-min) (point-max))
       (if headers (insert headers))
       (insert "\n")
-      (insert-buffer signature)
+      (insert-buffer-substring 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))))
-    (mm-with-unibyte-current-buffer-mule4
+    (unless (bobp)
+      (delete-region (point-min) (point)))
+    (mm-with-unibyte-current-buffer
       (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))
+	(delete-region (point-min) (point-max))
 	;;(insert "Content-Type: application/pgp-encrypted\n\n")
 	;;(insert "Version: 1\n\n")
-        (insert "\n")
-	(insert-buffer cipher)
+	(insert "\n")
+	(insert-buffer-substring cipher)
 	(goto-char (point-max))))))
 
+;; pgg wrapper
+
+(defvar pgg-default-user-id)
+(defvar pgg-errors-buffer)
+(defvar pgg-output-buffer)
+
+(defun mml1991-pgg-sign (cont)
+  (let ((pgg-text-mode t)
+	(pgg-default-user-id (or (message-options-get 'mml-sender)
+				 pgg-default-user-id))
+	headers cte)
+    ;; Don't sign headers.
+    (goto-char (point-min))
+    (when (re-search-forward "^$" nil t)
+      (setq headers (buffer-substring (point-min) (point)))
+      (save-restriction
+	(narrow-to-region (point-min) (point))
+	(setq cte (mail-fetch-field "content-transfer-encoding")))
+      (forward-line 1)
+      (delete-region (point-min) (point))
+      (when cte
+	(setq cte (intern (downcase cte)))
+	(mm-decode-content-transfer-encoding cte)))
+    (unless (pgg-sign-region (point-min) (point-max) t)
+      (pop-to-buffer pgg-errors-buffer)
+      (error "Encrypt error"))
+    (delete-region (point-min) (point-max))
+    (mm-with-unibyte-current-buffer
+      (insert-buffer-substring pgg-output-buffer)
+      (goto-char (point-min))
+      (while (re-search-forward "\r+$" nil t)
+	(replace-match "" t t))
+      (when cte
+	(mm-encode-content-transfer-encoding cte))
+      (goto-char (point-min))
+      (when headers
+	(insert headers))
+      (insert "\n"))
+    t))
+
+(defun mml1991-pgg-encrypt (cont &optional sign)
+  (goto-char (point-min))
+  (when (re-search-forward "^$" nil t)
+    (let ((cte (save-restriction
+		 (narrow-to-region (point-min) (point))
+		 (mail-fetch-field "content-transfer-encoding"))))
+      ;; Strip MIME headers since it will be ASCII armoured.
+      (forward-line 1)
+      (delete-region (point-min) (point))
+      (when cte
+	(mm-decode-content-transfer-encoding (intern (downcase cte))))))
+  (unless (let ((pgg-text-mode t))
+	    (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"))
+  (delete-region (point-min) (point-max))
+  (insert "\n")
+  (insert-buffer-substring pgg-output-buffer)
+  t)
+
+;; epg wrapper
+
+(defvar epg-user-id-alist)
+(defvar password-cache-expiry)
+
+(eval-and-compile
+  (autoload 'epg-make-context "epg")
+  (autoload 'epg-passphrase-callback-function "epg")
+  (autoload 'epa-select-keys "epa")
+  (autoload 'epg-list-keys "epg")
+  (autoload 'epg-context-set-armor "epg")
+  (autoload 'epg-context-set-textmode "epg")
+  (autoload 'epg-context-set-signers "epg")
+  (autoload 'epg-context-set-passphrase-callback "epg")
+  (autoload 'epg-sign-string "epg")
+  (autoload 'epg-encrypt-string "epg")
+  (autoload 'epg-configuration "epg-config")
+  (autoload 'epg-expand-group "epg-config"))
+
+(defvar mml1991-epg-secret-key-id-list nil)
+
+(defun mml1991-epg-passphrase-callback (context key-id ignore)
+  (if (eq key-id 'SYM)
+      (epg-passphrase-callback-function context key-id nil)
+    (let* ((entry (assoc key-id epg-user-id-alist))
+	   (passphrase
+	    (password-read
+	     (format "GnuPG passphrase for %s: "
+		     (if entry
+			 (cdr entry)
+		       key-id))
+	     (if (eq key-id 'PIN)
+		 "PIN"
+	       key-id))))
+      (when passphrase
+	(let ((password-cache-expiry mml1991-passphrase-cache-expiry))
+	  (password-cache-add key-id passphrase))
+	(setq mml1991-epg-secret-key-id-list
+	      (cons key-id mml1991-epg-secret-key-id-list))
+	(copy-sequence passphrase)))))
+
+(defun mml1991-epg-sign (cont)
+  (let ((context (epg-make-context))
+	headers cte signers signature)
+    (if mml1991-verbose
+	(setq signers (epa-select-keys context "Select keys for signing.
+If no one is selected, default secret key is used.  "
+				       mml1991-signers t))
+      (if mml1991-signers
+	  (setq signers (mapcar (lambda (name)
+				  (car (epg-list-keys context name t)))
+				mml1991-signers))))
+    (epg-context-set-armor context t)
+    (epg-context-set-textmode context t)
+    (epg-context-set-signers context signers)
+    (if mml1991-cache-passphrase
+	(epg-context-set-passphrase-callback
+	 context
+	 #'mml1991-epg-passphrase-callback))
+    ;; Don't sign headers.
+    (goto-char (point-min))
+    (when (re-search-forward "^$" nil t)
+      (setq headers (buffer-substring (point-min) (point)))
+      (save-restriction
+	(narrow-to-region (point-min) (point))
+	(setq cte (mail-fetch-field "content-transfer-encoding")))
+      (forward-line 1)
+      (delete-region (point-min) (point))
+      (when cte
+	(setq cte (intern (downcase cte)))
+	(mm-decode-content-transfer-encoding cte)))
+    (condition-case error
+	(setq signature (epg-sign-string context (buffer-string) 'clear)
+	      mml1991-epg-secret-key-id-list nil)
+      (error
+       (while mml1991-epg-secret-key-id-list
+	 (password-cache-remove (car mml1991-epg-secret-key-id-list))
+	 (setq mml1991-epg-secret-key-id-list
+	       (cdr mml1991-epg-secret-key-id-list)))
+       (signal (car error) (cdr error))))
+    (delete-region (point-min) (point-max))
+    (mm-with-unibyte-current-buffer
+      (insert signature)
+      (goto-char (point-min))
+      (while (re-search-forward "\r+$" nil t)
+	(replace-match "" t t))
+      (when cte
+	(mm-encode-content-transfer-encoding cte))
+      (goto-char (point-min))
+      (when headers
+	(insert headers))
+      (insert "\n"))
+    t))
+
+(defun mml1991-epg-encrypt (cont &optional sign)
+  (goto-char (point-min))
+  (when (re-search-forward "^$" nil t)
+    (let ((cte (save-restriction
+		 (narrow-to-region (point-min) (point))
+		 (mail-fetch-field "content-transfer-encoding"))))
+      ;; Strip MIME headers since it will be ASCII armoured.
+      (forward-line 1)
+      (delete-region (point-min) (point))
+      (when cte
+	(mm-decode-content-transfer-encoding (intern (downcase cte))))))
+  (let ((context (epg-make-context))
+	(recipients
+	 (if (message-options-get 'message-recipients)
+	     (split-string
+	      (message-options-get 'message-recipients)
+	      "[ \f\t\n\r\v,]+")))
+	cipher signers config)
+    ;; We should remove this check if epg-0.0.6 is released.
+    (if (and (condition-case nil
+		 (require 'epg-config)
+	       (error))
+	     (functionp #'epg-expand-group))
+	(setq config (epg-configuration)
+	      recipients
+	      (apply #'nconc
+		     (mapcar (lambda (recipient)
+			       (or (epg-expand-group config recipient)
+				   (list recipient)))
+			     recipients))))
+    (if mml1991-verbose
+	(setq recipients
+	      (epa-select-keys context "Select recipients for encryption.
+If no one is selected, symmetric encryption will be performed.  "
+			       recipients))
+      (setq recipients
+	    (delq nil (mapcar (lambda (name)
+				(car (epg-list-keys context name)))
+			      recipients))))
+    (if mml1991-encrypt-to-self
+	(if mml1991-signers
+	    (setq recipients
+		  (nconc recipients
+			 (mapcar (lambda (name)
+				   (car (epg-list-keys context name)))
+				 mml1991-signers)))
+	  (error "mml1991-signers not set")))
+    (when sign
+      (if mml1991-verbose
+	  (setq signers (epa-select-keys context "Select keys for signing.
+If no one is selected, default secret key is used.  "
+					 mml1991-signers t))
+	(if mml1991-signers
+	    (setq signers (mapcar (lambda (name)
+				    (car (epg-list-keys context name t)))
+				  mml1991-signers))))
+      (epg-context-set-signers context signers))
+    (epg-context-set-armor context t)
+    (epg-context-set-textmode context t)
+    (if mml1991-cache-passphrase
+	(epg-context-set-passphrase-callback
+	 context
+	 #'mml1991-epg-passphrase-callback))
+    (condition-case error
+	(setq cipher
+	      (epg-encrypt-string context (buffer-string) recipients sign)
+	      mml1991-epg-secret-key-id-list nil)
+      (error
+       (while mml1991-epg-secret-key-id-list
+	 (password-cache-remove (car mml1991-epg-secret-key-id-list))
+	 (setq mml1991-epg-secret-key-id-list
+	       (cdr mml1991-epg-secret-key-id-list)))
+       (signal (car error) (cdr error))))
+    (delete-region (point-min) (point-max))
+    (insert "\n" cipher))
+  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
@@ -214,4 +520,5 @@
 ;; coding: iso-8859-1
 ;; End:
 
+;;; arch-tag: e542be18-ab28-4393-9b33-97fe9cf30706
 ;;; mml1991.el ends here