Re: Patch for smime-stuff

["Arne Jørgensen" <arne@arnested.dk>]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

Arne Jørgensen <arne@arnested.dk> writes:

>        (smime-sign-buffer): Signal an error if `smime-sign-region' fails.
>        (smime-encrypt-buffer): Signal an error if `smime-encrypt-region'
>        fails.

Since this above changes is actually a security fix they should also
be commited to the v5-10 branch I think.

A patch for the v5-10 branch is attached.

Kind regards,
-- 
Arne Jørgensen <http://arnested.dk/>


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: smime_v5-10.patch --]
[-- Type: text/x-patch, Size: 2552 bytes --]

Index: lisp/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
retrieving revision 6.2771.2.115
diff -u -p -r6.2771.2.115 ChangeLog
--- lisp/ChangeLog	21 Feb 2005 13:38:17 -0000	6.2771.2.115
+++ lisp/ChangeLog	22 Feb 2005 22:16:09 -0000
@@ -1,3 +1,10 @@
+2005-02-22  Arne J^[,Ax^[(Brgensen  <arne@arnested.dk>
+
+	* smime.el (smime-sign-buffer): Signal an error if
+	`smime-sign-region' fails.
+	(smime-encrypt-buffer): Signal an error if `smime-encrypt-region'
+	fails.
+
 2005-02-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-art.el (gnus-parse-news-url, gnus-button-handle-news):
Index: lisp/smime.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/smime.el,v
retrieving revision 6.33.2.3
diff -u -p -r6.33.2.3 smime.el
--- lisp/smime.el	13 Feb 2005 04:46:05 -0000	6.33.2.3
+++ lisp/smime.el	22 Feb 2005 22:16:10 -0000
@@ -332,16 +332,17 @@ is expected to contain of a PEM encoded 
 KEYFILE should contain a PEM encoded key and certificate."
   (interactive)
   (with-current-buffer (or buffer (current-buffer))
-    (smime-sign-region
-     (point-min) (point-max)
-     (if keyfile
-	 keyfile
-       (smime-get-key-with-certs-by-email
-	(completing-read
-	 (concat "Sign using which key? "
-		 (if smime-keys (concat "(default " (caar smime-keys) ") ")
-		   ""))
-	 smime-keys nil nil (car-safe (car-safe smime-keys))))))))
+    (unless (smime-sign-region
+	     (point-min) (point-max)
+	     (if keyfile
+		 keyfile
+	       (smime-get-key-with-certs-by-email
+		(completing-read
+		 (concat "Sign using which key? "
+			 (if smime-keys (concat "(default " (caar smime-keys) ") ")
+			   ""))
+		 smime-keys nil nil (car-safe (car-safe smime-keys))))))
+      (error "Signing failed"))))
 
 (defun smime-encrypt-buffer (&optional certfiles buffer)
   "S/MIME encrypt BUFFER for recipients specified in CERTFILES.
@@ -350,11 +351,12 @@ a PEM encoded key and certificate.  Uses
 nil."
   (interactive)
   (with-current-buffer (or buffer (current-buffer))
-    (smime-encrypt-region
-     (point-min) (point-max)
-     (or certfiles
-	 (list (read-file-name "Recipient's S/MIME certificate: "
-			       smime-certificate-directory nil))))))
+    (unless (smime-encrypt-region
+	     (point-min) (point-max)
+	     (or certfiles
+		 (list (read-file-name "Recipient's S/MIME certificate: "
+				       smime-certificate-directory nil))))
+      (error "Encryption failed"))))
 
 ;; Verify+decrypt region