2000-11-13 15:29:58 ShengHuo ZHU <zsh@cs.rochester.edu>

	* smime.el (smime-openssl-program): Test the existence of openssl.
	* mml-smime.el: Require mm-decode.
	(mml-smime-verify-test): New function.
	* mm-decode.el (mm-verify-function-alist): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5161f6..a6ca181 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-13 15:29:58  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * smime.el (smime-openssl-program): Test the existence of openssl.
+       * mml-smime.el: Require mm-decode.
+       (mml-smime-verify-test): New function.
+       * mm-decode.el (mm-verify-function-alist): Use it.
+
 2000-11-13 09:50:29  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-sum.el (gnus-summary-repair-multipart): Fix Mime-Version

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 5a09f13..55b9f8a 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -239,11 +239,14 @@ to:
 (autoload 'mml2015-verify "mml2015")
 (autoload 'mml2015-verify-test "mml2015")
 (autoload 'mml-smime-verify "mml-smime")
+(autoload 'mml-smime-verify-test "mml-smime")
 
 (defvar mm-verify-function-alist
   '(("application/pgp-signature" mml2015-verify "PGP" mml2015-verify-test)
-    ("application/pkcs7-signature" mml-smime-verify "S/MIME" nil)
-    ("application/x-pkcs7-signature" mml-smime-verify "S/MIME" nil)))
+    ("application/pkcs7-signature" mml-smime-verify "S/MIME" 
+     mml-smime-verify-test)
+    ("application/x-pkcs7-signature" mml-smime-verify "S/MIME" 
+     mml-smime-verify-test)))
 
 (defcustom mm-verify-option nil
   "Option of verifying signed parts.

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index a649a9b..62e27d6 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -28,6 +28,7 @@
 ;;; Code:
 
 (require 'smime)
+(require 'mm-decode)
 
 (defun mml-smime-verify (handle ctl)
   (with-current-buffer (mm-handle-multipart-original-buffer ctl)
@@ -54,6 +55,9 @@
                                          (buffer-string))))
     handle))
 
+(defun mml-smime-verify-test (handle ctl)
+  smime-openssl-program)
+
 (provide 'mml-smime)
 
 ;;; mml-smime.el ends here

diff --git a/lisp/smime.el b/lisp/smime.el
index 912b1cd..530ed8d 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -140,7 +140,11 @@ manually."
   :type 'directory
   :group 'smime)
 
-(defcustom smime-openssl-program "openssl"
+(defcustom smime-openssl-program 
+  (and (condition-case () 
+          (eq 0 (call-process "openssl" nil nil nil "version"))
+        (error nil))
+       "openssl")
   "Name of OpenSSL binary."
   :type 'string
   :group 'smime)