#
#
# patch "NEWS"
#  from [383e7c978e5385b8d6394b473cfc17ae83a9ddf7]
#    to [77892b9cee39daedbc6cc3f3d53249e8910e5d04]
# 
# patch "key_store.cc"
#  from [b78c703dc6b4f9b29b55526df73c09c60185cdc8]
#    to [d3ba874f95eaeee966f57e37205c67718e20bc76]
#
============================================================
--- NEWS	383e7c978e5385b8d6394b473cfc17ae83a9ddf7
+++ NEWS	77892b9cee39daedbc6cc3f3d53249e8910e5d04
@@ -10,6 +10,9 @@ XXX XXX XX XX:XX:XX UTC 2010
 
         Bugs fixed
 
+	- 'passphrase' now allows an empty new password to be given
+          (fixes monotone bug #28809)
+ 
         Other
 
 
============================================================
--- key_store.cc	b78c703dc6b4f9b29b55526df73c09c60185cdc8
+++ key_store.cc	d3ba874f95eaeee966f57e37205c67718e20bc76
@@ -745,13 +745,17 @@ key_store::change_key_passphrase(key_id 
   get_passphrase(new_phrase, name, id, true, false);
 
   unfiltered_pipe->start_msg();
-  Botan::PKCS8::encrypt_key(*priv, *unfiltered_pipe,
+  if (new_phrase().length())
+    Botan::PKCS8::encrypt_key(*priv, *unfiltered_pipe,
 #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7)
-                            s->rng->get(),
+                              s->rng->get(),
 #endif
-                            new_phrase(),
-                            "PBE-PKCS5v20(SHA-1,TripleDES/CBC)",
-                            Botan::RAW_BER);
+                              new_phrase(),
+                              "PBE-PKCS5v20(SHA-1,TripleDES/CBC)",
+                              Botan::RAW_BER);
+  else
+    Botan::PKCS8::encode(*priv, *unfiltered_pipe);
+
   unfiltered_pipe->end_msg();
   kp.priv = rsa_priv_key(unfiltered_pipe->read_all_as_string(Pipe::LAST_MESSAGE),
                          origin::internal);