update.

[elisp/semi.git] / smime.el

diff --git a/smime.el b/smime.el
index ce7e984..8bd0ad8 100644 (file)
--- a/smime.el
+++ b/smime.el
@@ -39,6 +39,7 @@
 ;;; Code:
 
 (require 'path-util)
+(eval-when-compile (require 'static))
 
 (defgroup smime ()
   "S/MIME interface"
@@ -169,9 +170,30 @@
        (smime-parse-attribute
         (buffer-substring (point)(progn (end-of-line)(point))))))))
 
-(defsubst smime-search-certificate (attr)
+(static-condition-case nil
+    (directory-files nil nil nil nil nil)
+  (wrong-number-of-arguments
+   (defmacro smime-directory-files 
+     (directory &optional full match nosort files-only)
+     (if files-only
+        `(delq nil (mapcar 
+                    (lambda (file) 
+                      ,(if (eq files-only t)
+                           `(if (file-directory-p file) nil file)
+                         `(if (file-directory-p file) file nil)))
+                    (directory-files ,directory ,full ,match ,nosort)))
+       `(directory-files ,directory ,full ,match ,nosort))))
+  (error
+   (defalias 'smime-directory-files 'directory-files)))
+
+(defsubst smime-find-certificate (attr)
   (let ((files (if (file-directory-p smime-certificate-directory)
-                  (directory-files smime-certificate-directory)
+                  (delq nil (mapcar (lambda (file) 
+                                      (if (file-directory-p file) nil
+                                        file))
+                                    (directory-files 
+                                     smime-certificate-directory
+                                     'full)))
                 nil)))
     (catch 'found
       (while files
@@ -240,7 +262,11 @@
              (expand-file-name (read-file-name "Public key file: "))))
         (args (list "-e" key-file)))
     (smime-process-region start end smime-program args)
-    (smime-process-when-success nil)))
+    (smime-process-when-success 
+      (goto-char (point-min))
+      (delete-region (point-min) (progn
+                                  (re-search-forward "^$" nil t)
+                                  (1+ (point)))))))
 
 ;;;###autoload
 (defun smime-decrypt-region (start end)
@@ -273,6 +299,10 @@ a detached signature."
         (args (list "-ds" key-file passphrase)))
     (smime-process-region start end smime-program args)
     (smime-process-when-success 
+      (goto-char (point-min))
+      (delete-region (point-min) (progn
+                                  (re-search-forward "^$" nil t)
+                                  (1+ (point))))
       (when smime-cache-passphrase
        (smime-add-passphrase-cache hash passphrase)))))
 
@@ -284,8 +314,7 @@ the detached signature of the current region."
   (let* ((basename (expand-file-name "smime" temporary-file-directory))
         (orig-file (make-temp-name basename))
         (args (list "-qs" signature))
-        (orig-mode (default-file-modes))
-        cert-file)
+        (orig-mode (default-file-modes)))
     (unwind-protect
        (progn
          (set-default-file-modes 448)
@@ -295,17 +324,14 @@ the detached signature of the current region."
     (with-temp-buffer
       (insert-file-contents-as-binary signature)
       (goto-char (point-max))
-      (insert "\n")
       (insert-file-contents-as-binary
-       (or (smime-search-certificate 
+       (or (smime-find-certificate 
            (smime-query-signer (point-min)(point-max)))
           (expand-file-name 
            (read-file-name "Certificate file: "))))
-      (smime-process-region (point-min)(point-max) smime-program args))
-    (smime-process-when-success 
-      (when smime-cache-passphrase
-       (smime-add-passphrase-cache hash passphrase)))
-    ))
+      (smime-process-region (point-min)(point-max) smime-program 
+                           (list "-dv" orig-file)))
+    (smime-process-when-success nil)))
 
 (provide 'smime)