# 
# patch "ChangeLog"
#  from [0b02344ec102d8a318b0e22f28320b77d9bb54e9]
#    to [cb52fecca27e830df7df79c18b526554e38b2b4e]
# 
# patch "keys.cc"
#  from [c7e92c765f912c61883b4cf40968b7260c753a54]
#    to [3fb812c189636b0fb652994edb0b82fde2d71f93]
# 
========================================================================
--- ChangeLog	0b02344ec102d8a318b0e22f28320b77d9bb54e9
+++ ChangeLog	cb52fecca27e830df7df79c18b526554e38b2b4e
@@ -1,3 +1,8 @@
+2005-09-28  Timothy Brownawell  <address@hidden>
+
+	* keys.cc (get_private_key): don't use lua hook passwords for
+	chkeypass.
+
 2005-09-28  Matt Johnston  <address@hidden>
 
 	* keys.cc (get_private_keys): don't use lua hook passwords for
========================================================================
--- keys.cc	c7e92c765f912c61883b4cf40968b7260c753a54
+++ keys.cc	3fb812c189636b0fb652994edb0b82fde2d71f93
@@ -189,14 +189,14 @@
 {
   rsa_priv_key decoded_key;
   string phrase;
-  bool force = false;
+  bool force = force_from_user;
 
   L(F("base64-decoding %d-byte private key\n") % priv().size());
   L(F("priv '%s'\n") % priv());
   decode_base64(priv, decoded_key);
   for (int i = 0; i < 3; ++i)
     {
-      get_passphrase(lua, id, phrase, force_from_user, force);
+      get_passphrase(lua, id, phrase, false, force);
       L(F("have %d-byte encrypted private key\n") % decoded_key().size());
       L(F("decoded '%s'\n") % decoded_key());