# 
# patch "ChangeLog"
#  from [327cd28105cbe16646affa1f238c8d8701fa804e]
#    to [65aa0ed19a64dffda8710a99d557e84b425bafe2]
# 
# patch "keys.cc"
#  from [9c50dc0d669ffb6ad2328c46485bf3ae65dad4b5]
#    to [ce321b22dc9ac2b0b0066447a06ac5710142653c]
# 
===============================================
--- ChangeLog	327cd28105cbe16646affa1f238c8d8701fa804e
+++ ChangeLog	65aa0ed19a64dffda8710a99d557e84b425bafe2
@@ -1,3 +1,7 @@
+2005-07-18  Matt Johnston  <address@hidden>
+
+	* keys.cc (get_passphrase): don't bomb out if they type an empty passphrase.
+
 2005-07-18  Patrick Mauritz  <address@hidden>
 
 	* work.cc, manifest.cc: Remove 'using namespace boost'.
===============================================
--- keys.cc	9c50dc0d669ffb6ad2328c46485bf3ae65dad4b5
+++ keys.cc	ce321b22dc9ac2b0b0066447a06ac5710142653c
@@ -92,8 +92,12 @@
           read_password(prompt_beginning + " for key ID [" + keyid() + "]: ",
                         pass1, constants::maxpasswd);
           cout << endl;
-          N(pass1[0],
-            F("empty passphrase not allowed"));
+          if (strlen(pass1) == 0)
+            {
+              P(F("empty passphrase not allowed"));
+              continue;
+            }
+
           if (confirm_phrase)
             {
               ui.ensure_clean_line();