* mm-view.el (mm-view-pkcs7-verify): Implement using smime.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 299f6a4..ca9d8e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-21  Arne J\e,Ax\e(Brgensen <arne@arnested.dk>
+
+       * mm-view.el (mm-view-pkcs7-verify): Implement using smime.el.
+
 2006-02-21  Wolfram Fenske  <wolfram.fenske@student.uni-magdeburg.de>
        (tiny change)
 

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 2853a41..466bc32 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -623,19 +623,24 @@
     (otherwise (error "Unknown or unimplemented PKCS#7 type"))))
 
 (defun mm-view-pkcs7-verify (handle)
-  ;; A bogus implementation of PKCS#7. FIXME::
-  (mm-insert-part handle)
-  (goto-char (point-min))
-  (if (search-forward "Content-Type: " nil t)
-      (delete-region (point-min) (match-beginning 0)))
-  (goto-char (point-max))
-  (if (re-search-backward "--\r?\n?" nil t)
-      (delete-region (match-end 0) (point-max)))
+  (let ((verified nil))
+    (with-temp-buffer
+      (insert "MIME-Version: 1.0\n")
+      (mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m")
+      (insert-buffer-substring (mm-handle-buffer handle))
+      (setq verified (smime-verify-region (point-min) (point-max))))
+    (goto-char (point-min))
+    (mm-insert-part handle)
+    (if (search-forward "Content-Type: " nil t)
+       (delete-region (point-min) (match-beginning 0)))
+    (goto-char (point-max))
+    (if (re-search-backward "--\r?\n?" nil t)
+       (delete-region (match-end 0) (point-max)))
+    (unless verified
+      (insert-buffer-substring smime-details-buffer)))
   (goto-char (point-min))
   (while (search-forward "\r\n" nil t)
     (replace-match "\n"))
-  (message "Verify signed PKCS#7 message is unimplemented.")
-  (sit-for 1)
   t)
 
 (defun mm-view-pkcs7-decrypt (handle)