;;; Code:
(require 'path-util)
+(eval-when-compile (require 'static))
(defgroup smime ()
"S/MIME interface"
(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))))
+ (wrong-type-argument
+ (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
(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)
(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)