# 
# 
# patch "ssh_agent.cc"
#  from [684c3a9a60011e3a17d44058f129b776b4411f97]
#    to [65538727dde61776cafa9939d576d92ffaf1235c]
# 
# patch "ssh_agent.hh"
#  from [9a53277b64b9c524c6f6e63c1b5616b2af648889]
#    to [3b3de8c7db5bd5f7f76a3314d20c0a635dbcef34]
# 
============================================================
--- ssh_agent.cc	684c3a9a60011e3a17d44058f129b776b4411f97
+++ ssh_agent.cc	65538727dde61776cafa9939d576d92ffaf1235c
@@ -8,6 +8,8 @@
 #include "sanity.hh"
 #include "netio.hh"
 
+using std::min;
+
 ssh_agent::ssh_agent() {
 }
 
@@ -131,7 +133,7 @@ ssh_agent::get_keys() {
 vector<RSA_PublicKey> const
 ssh_agent::get_keys() {
   unsigned int len;
-  unsigned long ret;
+  int ret;
   char buf[4];
 
   unsigned int ch;
@@ -152,7 +154,7 @@ ssh_agent::get_keys() {
   L(FL("agent: get_keys response len %u") % len);
 
   string packet;
-  const int bufsize = 4096;
+  const long bufsize = 4096;
   char read_buf[bufsize];
   long get = len;
   while (get > 0) {
@@ -246,7 +248,7 @@ void
 }
 
 void
-ssh_agent::sign_data(RSA_PublicKey const key, string const data, string & out) {
+ssh_agent::sign_data(RSA_PublicKey const & key, string const & data, string & out) {
   L(FL("agent: sign_data: key e: %s, n: %s, data len: %i") % key.get_e() % key.get_n() % data.length());
   string packet_out;
   string key_buf;
@@ -263,7 +265,7 @@ ssh_agent::sign_data(RSA_PublicKey const
 
   char buf[4];
   unsigned long len;
-  unsigned long ret;
+  int ret;
   ret = stream->read(buf, 4);
   len = get_long(buf);
 
@@ -272,7 +274,7 @@ ssh_agent::sign_data(RSA_PublicKey const
   L(FL("agent: sign_data response len %u") % len);
 
   string packet_in;
-  const int bufsize = 4096;
+  const long bufsize = 4096;
   char read_buf[bufsize];
   long get = len;
   while (get > 0) {
============================================================
--- ssh_agent.hh	9a53277b64b9c524c6f6e63c1b5616b2af648889
+++ ssh_agent.hh	3b3de8c7db5bd5f7f76a3314d20c0a635dbcef34
@@ -20,19 +20,19 @@ public:
   ssh_agent();
   void connect();
   vector<RSA_PublicKey> const get_keys();
-  void sign_data(RSA_PublicKey const key, string const data, string & out);
+  void sign_data(RSA_PublicKey const & key, string const & data, string & out);
 
 private:
   shared_ptr<Stream> stream;
   vector<RSA_PublicKey> keys;
 
-  unsigned long get_long(char const buf[4]);
-  unsigned long get_long_from_buf(string const buf, unsigned long &loc);
-  void get_string_from_buf(string const buf, unsigned long &loc, unsigned long &len, string &out);
-  void put_key_into_buf(RSA_PublicKey const key, string & buf);
-  void put_string_into_buf(string const str, string & buf);
-  void put_bigint_into_buf(BigInt bi, string & buf);
-  void put_long(unsigned long l, char buf[4]);
+  unsigned long get_long(char const * buf);
+  unsigned long get_long_from_buf(string const & buf, unsigned long & loc);
+  void get_string_from_buf(string const & buf, unsigned long & loc, unsigned long & len, string & out);
+  void put_key_into_buf(RSA_PublicKey const & key, string & buf);
+  void put_string_into_buf(string const & str, string & buf);
+  void put_bigint_into_buf(BigInt const & bi, string & buf);
+  void put_long(unsigned long l, char * buf);
   void put_long_into_buf(unsigned long l, string & buf);
 };