From: Simon Josefsson <jas@extundo.com>
Date: Mon, 4 Mar 2002 20:16:05 +0000 (+0000)
Subject: 2002-03-04  Simon Josefsson  <jas@extundo.com>
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=ced3656f2fbf8c0be27692f768d380fcc178f9ba;p=gnus

2002-03-04  Simon Josefsson  <jas@extundo.com>

	* smime.el (smime-sign-region): Rename argument keyfiles to
	keyfile. You only sign something with one key.
	(smime-sign-buffer): Better completing-read prompt.
	(smime-decrypt-buffer): Ditto.

	* smime.el (smime-make-temp-file): Make it work under XEmacs.

	* mm-view.el (mm-view-pkcs7-decrypt): Better prompt for
	completing-read.
	(mm-view-pkcs7-decrypt): CRLF->LF.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 420b885a7..29351d8b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2002-03-04  Simon Josefsson  <jas@extundo.com>
+
+	* smime.el (smime-sign-region): Rename argument keyfiles to
+	keyfile. You only sign something with one key.
+	(smime-sign-buffer): Better completing-read prompt.
+	(smime-decrypt-buffer): Ditto.
+
+	* smime.el (smime-make-temp-file): Make it work under XEmacs.
+
+	* mm-view.el (mm-view-pkcs7-decrypt): Better prompt for
+	completing-read.
+	(mm-view-pkcs7-decrypt): CRLF->LF.
+
 2002-03-04  Paul Jarc  <prj@po.cwru.edu>
 
 	* message.el (message-hierarchical-addresses): New variable.
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index af4431358..b763bfa30 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -601,10 +601,15 @@ will not be substituted.")
    (if (= (length smime-keys) 1)
        (cadar smime-keys)
      (smime-get-key-by-email
-      (completing-read "Decrypt this part with which key? "
-		       smime-keys nil nil
-		       (and (listp (car-safe smime-keys))
-			    (caar smime-keys)))))))
+      (completing-read
+       (concat "Decipher using which key? "
+	       (if smime-keys (concat "(default " (caar smime-keys) ") ")
+		 ""))
+       smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
+  (goto-char (point-min))
+  (while (search-forward "\r\n" nil t)
+    (replace-match "\n"))
+  (goto-char (point-min)))
 
 (provide 'mm-view)
 
diff --git a/lisp/smime.el b/lisp/smime.el
index 3649badfe..1157505de 100644
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -201,7 +201,9 @@ If nil, use system defaults."
       (lambda (prefix &optional dir-flag) ;; Simple implementation
 	(expand-file-name
 	 (make-temp-name prefix)
-	 temporary-file-directory)))))
+	 (if (fboundp 'temp-directory)
+	     (temp-directory)
+	   'temporary-file-directory))))))
 
 ;; Password dialog function
 
@@ -232,15 +234,17 @@ If nil, use system defaults."
 
 ;; Sign+encrypt region
 
-(defun smime-sign-region (b e keyfiles)
-  "Sign region with certified key in KEYFILES.
+(defun smime-sign-region (b e keyfile)
+  "Sign region with certified key in KEYFILE.
 If signing fails, the buffer is not modified.  Region is assumed to
-have proper MIME tags.  KEYFILES is expected to contain a PEM encoded
-private key and certificate as its car, and a list of additional certificates
-to include in its caar."
+have proper MIME tags.  KEYFILE is expected to contain a PEM encoded
+private key and certificate as its car, and a list of additional
+certificates to include in its caar.  If no additional certificates is
+included, KEYFILE may be the file containing the PEM encoded private
+key and certificate itself."
   (smime-new-details-buffer)
-  (let ((keyfile (car keyfiles))
-	(certfiles (and (cdr keyfiles) (cadr keyfiles)))
+  (let ((keyfile (or (car-safe keyfile) keyfile))
+	(certfiles (and (cdr-safe keyfile) (cadr keyfile)))
 	(buffer (generate-new-buffer (generate-new-buffer-name " *smime*")))
 	(passphrase (smime-ask-passphrase))
 	(tmpfile (smime-make-temp-file "smime")))
@@ -307,11 +311,13 @@ KEYFILE should contain a PEM encoded key and certificate."
     (smime-sign-region
      (point-min) (point-max)
      (if keyfile
-	 (list keyfile (smime-get-certfiles keyfile smime-keys))
+	 keyfile
        (smime-get-key-by-email
-	(completing-read "Sign using which signature? " smime-keys nil nil
-			 (and (listp (car-safe smime-keys))
-			      (cdr smime-keys))))))))
+	(completing-read
+	 (concat "Sign using which signature? "
+		 (if smime-keys (concat "(default " (caar smime-keys) ") ")
+		   ""))
+	 smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))))
 
 (defun smime-encrypt-buffer (&optional certfiles buffer)
   "S/MIME encrypt BUFFER for recipients specified in CERTFILES.
@@ -428,9 +434,11 @@ in the buffer specified by `smime-details-buffer'."
      (expand-file-name
       (or keyfile
 	  (smime-get-key-by-email
-	   (completing-read "Decrypt with which key? " smime-keys nil nil
-			    (and (listp (car-safe smime-keys))
-				 (caar smime-keys)))))))))
+	   (completing-read
+	    (concat "Decipher using which key? "
+		    (if smime-keys (concat "(default " (caar smime-keys) ") ")
+		      ""))
+	    smime-keys nil nil nil nil (car-safe (car-safe smime-keys)))))))))
 
 ;; Various operations