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

(mml2015-verbose): Inherit the default value from mml-secure-verbose.
(mml2015-cache-passphrase): Inherit the default value from
mml-secure-cache-passphrase.
(mml2015-passphrase-cache-expiry): Inherit the default value from
mml-secure-passphrase-cache-expiry.

* mml1991.el: Require mml-sec instead of password.
(mml1991-verbose): Inherit the default value from mml-secure-verbose.
(mml1991-cache-passphrase): Inherit the default value from
mml-secure-cache-passphrase.
(mml1991-passphrase-cache-expiry): Inherit the default value from
mml-secure-passphrase-cache-expiry.

* mml-sec.el: Require password.
(mml-secure-verbose): New user option.
(mml-secure-cache-passphrase): New user option.
(mml-secure-passphrase-cache-expiry): New user option.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e26f063..7de7934 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2006-07-25  Daiki Ueno  <ueno@unixuser.org>
+
+       * mml2015.el: Require mml-sec instead of password.
+       (mml2015-verbose): Inherit the default value from mml-secure-verbose.
+       (mml2015-cache-passphrase): Inherit the default value from
+       mml-secure-cache-passphrase.
+       (mml2015-passphrase-cache-expiry): Inherit the default value from
+       mml-secure-passphrase-cache-expiry.
+
+       * mml1991.el: Require mml-sec instead of password.
+       (mml1991-verbose): Inherit the default value from mml-secure-verbose.
+       (mml1991-cache-passphrase): Inherit the default value from
+       mml-secure-cache-passphrase.
+       (mml1991-passphrase-cache-expiry): Inherit the default value from
+       mml-secure-passphrase-cache-expiry.
+
+       * mml-sec.el: Require password.
+       (mml-secure-verbose): New user option.
+       (mml-secure-cache-passphrase): New user option.
+       (mml-secure-passphrase-cache-expiry): New user option.
+
 2006-07-24  Daiki Ueno  <ueno@unixuser.org>
 
        * pgg-def.el (pgg-truncate-key-identifier): Truncate the key ID to 8

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 42160b5..cac0a9f 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -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)

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index f3f3b46..ca7f5b9 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -32,7 +32,7 @@
   (require 'cl)
   (require 'mm-util))
 
-(require 'password)
+(require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
 
@@ -53,13 +53,13 @@
         mml1991-epg-encrypt))
   "Alist of PGP functions.")
 
-(defvar mml1991-verbose nil
+(defvar mml1991-verbose mml-secure-verbose
   "If non-nil, ask the user about the current operation more verbosely.")
 
-(defvar mml1991-cache-passphrase t
+(defvar mml1991-cache-passphrase mml-secure-cache-passphrase
   "If t, cache passphrase.")
 
-(defvar mml1991-passphrase-cache-expiry 16
+(defvar mml1991-passphrase-cache-expiry mml-secure-passphrase-cache-expiry
   "How many seconds the passphrase is cached.
 Whether the passphrase is cached at all is controlled by
 `mml1991-cache-passphrase'.")
@@ -315,16 +315,19 @@ Whether the passphrase is cached at all is controlled by
   (autoload 'epg-passphrase-callback-function "epg")
   (autoload 'epa-select-keys "epa")
   (autoload 'epg-list-keys "epg")
-
   (autoload 'epg-context-set-armor "epg")
   (autoload 'epg-context-set-textmode "epg")
-
   (autoload 'epg-context-set-signers "epg")
   (autoload 'epg-context-set-passphrase-callback "epg")
-
   (autoload 'epg-sign-string "epg")
   (autoload 'epg-encrypt-string "epg"))
 
+(eval-when-compile
+  (defvar password-cache-expiry)
+  (autoload 'password-read "password")
+  (autoload 'password-cache-add "password")
+  (autoload 'password-cache-remove "password"))
+
 (defvar mml1991-epg-secret-key-id-list nil)
 
 (defun mml1991-epg-passphrase-callback (context key-id ignore)

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 26576e8..35d025a 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -34,7 +34,7 @@
 (require 'mm-decode)
 (require 'mm-util)
 (require 'mml)
-(require 'password)
+(require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
 
@@ -103,17 +103,17 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
   :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
 
-(defcustom mml2015-verbose nil
+(defcustom mml2015-verbose mml-secure-verbose
   "If non-nil, ask the user about the current operation more verbosely."
   :group 'mime-security
   :type 'boolean)
 
-(defcustom mml2015-cache-passphrase t
+(defcustom mml2015-cache-passphrase mml-secure-cache-passphrase
   "If t, cache passphrase."
   :group 'mime-security
   :type 'boolean)
 
-(defcustom mml2015-passphrase-cache-expiry 16
+(defcustom mml2015-passphrase-cache-expiry mml-secure-passphrase-cache-expiry
   "How many seconds the passphrase is cached.
 Whether the passphrase is cached at all is controlled by
 `mml2015-cache-passphrase'."
@@ -922,6 +922,12 @@ Whether the passphrase is cached at all is controlled by
   (autoload 'epg-passphrase-callback-function "epg")
   (autoload 'epg-context-set-passphrase-callback "epg"))
 
+(eval-when-compile
+  (defvar password-cache-expiry)
+  (autoload 'password-read "password")
+  (autoload 'password-cache-add "password")
+  (autoload 'password-cache-remove "password"))
+
 (defvar mml2015-epg-secret-key-id-list nil)
 
 (defun mml2015-epg-passphrase-callback (context key-id ignore)