* mml2015.el: Require mml-sec instead of password.

[gnus] / lisp / mml-sec.el

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index c891dfb..cac0a9f 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -1,7 +1,7 @@
 ;;; mml-sec.el --- A package with security functions for MML documents
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
@@ -28,6 +28,7 @@
 
 (require 'mml-smime)
 (eval-when-compile (require 'cl))
+(require 'password)
 (autoload 'mml2015-sign "mml2015")
 (autoload 'mml2015-encrypt "mml2015")
 (autoload 'mml1991-sign "mml1991")
@@ -96,6 +97,23 @@ details."
                       (choice (const :tag "Separate" separate)
                               (const :tag "Combined" combined)))))
 
+(defcustom mml-secure-verbose nil
+  "If non-nil, ask the user about the current operation more verbosely."
+  :group 'message
+  :type 'boolean)
+
+(defcustom mml-secure-cache-passphrase password-cache
+  "If t, cache passphrase."
+  :group 'message
+  :type 'boolean)
+
+(defcustom mml-secure-passphrase-cache-expiry password-cache-expiry
+  "How many seconds the passphrase is cached.
+Whether the passphrase is cached at all is controlled by
+`mml-secure-cache-passphrase'."
+  :group 'message
+  :type 'integer)
+
 ;;; Configuration/helper functions
 
 (defun mml-signencrypt-style (method &optional style)