# # # patch "cmd_agent.cc" # from [9ce1b18ff2d1e4c354360ee26eb650c2637260b6] # to [de00d7a13f23dabb713bf7d26b8bad524ea262c5] # # patch "ssh_agent.cc" # from [6e2e784bd8ad59cc47defc7d1c6255ffc1e28134] # to [caa1fb5946aea8300fb08d821f6a2af0e9c0f1ea] # ============================================================ --- cmd_agent.cc 9ce1b18ff2d1e4c354360ee26eb650c2637260b6 +++ cmd_agent.cc de00d7a13f23dabb713bf7d26b8bad524ea262c5 @@ -37,11 +37,14 @@ agent_export(string const & name, app_st get_passphrase(app.lua, id, new_phrase, true, true, "enter new passphrase"); Pipe p; p.start_msg(); - if (new_phrase().length()) { - Botan::PKCS8::encrypt_key(*priv, p, new_phrase(), "PBE-PKCS5v20(SHA-1,TripleDES/CBC)"); - } else { - Botan::PKCS8::encode(*priv, p); - } + if (new_phrase().length()) + { + Botan::PKCS8::encrypt_key(*priv, p, new_phrase(), "PBE-PKCS5v20(SHA-1,TripleDES/CBC)"); + } + else + { + Botan::PKCS8::encode(*priv, p); + } string decoded_key = p.read_all_as_string(); cout << decoded_key; } ============================================================ --- ssh_agent.cc 6e2e784bd8ad59cc47defc7d1c6255ffc1e28134 +++ ssh_agent.cc caa1fb5946aea8300fb08d821f6a2af0e9c0f1ea @@ -127,9 +127,10 @@ ssh_agent::~ssh_agent() ssh_agent::~ssh_agent() { - if (connected()) { - stream->close(); - } + if (connected()) + { + stream->close(); + } } bool