# 
# patch "ChangeLog"
#  from [6835fd154738f6c146ac64777b2c66166bb3dd9f]
#    to [0b02344ec102d8a318b0e22f28320b77d9bb54e9]
# 
# patch "keys.cc"
#  from [7b5ef93c3fcad578dbc30201d66f98d0a62405af]
#    to [c7e92c765f912c61883b4cf40968b7260c753a54]
# 
========================================================================
--- ChangeLog	6835fd154738f6c146ac64777b2c66166bb3dd9f
+++ ChangeLog	0b02344ec102d8a318b0e22f28320b77d9bb54e9
@@ -1,3 +1,8 @@
+2005-09-28  Matt Johnston  <address@hidden>
+
+	* keys.cc (get_private_keys): don't use lua hook passwords for
+	chkeypass.
+
 2005-09-28  Timothy Brownawell  <address@hidden>
 
 	* key_store.cc: fix delete_key
========================================================================
--- keys.cc	7b5ef93c3fcad578dbc30201d66f98d0a62405af
+++ keys.cc	c7e92c765f912c61883b4cf40968b7260c753a54
@@ -184,7 +184,8 @@
 shared_ptr<RSA_PrivateKey>
 get_private_key(lua_hooks & lua,
                 rsa_keypair_id const & id,
-                base64< rsa_priv_key > const & priv)
+                base64< rsa_priv_key > const & priv,
+                bool force_from_user = false)
 {
   rsa_priv_key decoded_key;
   string phrase;
@@ -195,7 +196,7 @@
   decode_base64(priv, decoded_key);
   for (int i = 0; i < 3; ++i)
     {
-      get_passphrase(lua, id, phrase, false, force);
+      get_passphrase(lua, id, phrase, force_from_user, force);
       L(F("have %d-byte encrypted private key\n") % decoded_key().size());
       L(F("decoded '%s'\n") % decoded_key());
 
@@ -300,7 +301,7 @@
                       rsa_keypair_id const & id,
                       base64< rsa_priv_key > & encoded_key)
 {
-  shared_ptr<RSA_PrivateKey> priv = get_private_key(lua, id, encoded_key);
+  shared_ptr<RSA_PrivateKey> priv = get_private_key(lua, id, encoded_key, true);
 
   string new_phrase;
   get_passphrase(lua, id, new_phrase, true, true, "enter new passphrase");