*** empty log message ***

Rev: src/keyexchange.c:1.9
Rev: src/keyexchange.h:1.10
Rev: src/read_packet.h:1.6

src/keyexchange.c

@@ -195,7 +195,7 @@ static int do_handle_kexinit(struct packet_hander *c,
     return 0;
 
   /* Save value for later signing */
-  connection->literal_kexinits[connection->type] = packet;
+  connection->literal_kexinits[!connection->type] = packet;
   
   connection->kexinits[!connection->type] = msg;
   
@@ -203,9 +203,13 @@ static int do_handle_kexinit(struct packet_hander *c,
   if (!connection->kexinits[connection->type])
     {
       int res;
+      struct lsh_string *packet;
       struct kexinit *sent =  GENERATE_KEXINIT(closure->init);
       connection->kexinits[connection->type] = sent;
-      res = A_WRITE(connection->write, format_kex(sent));
+      packet = format_kex(sent);
+      connection->kexinits[connection->type] = lsh_string_dup(packet); 
+      
+      res = A_WRITE(connection->write, packet);
       if (res != WRITE_OK)
 	return res;
     }
@@ -242,6 +246,7 @@ static int do_handle_kexinit(struct packet_hander *c,
       hostkey_algorithm
 	= select_algorithm(connection->kexinits[0]->server_hostkey_algorithms,
 			   connection->kexinits[1]->server_hostkey_algorithms);
+
       for(i = 0; i<KEX_PARAMETERS; i++)
 	{
 	  parameters[i]
@@ -251,7 +256,7 @@ static int do_handle_kexinit(struct packet_hander *c,
 	  if (!parameters[i])
 	    {
 	      send_disconnect(connection, "");
-	      return wRITE_CLOSED;
+	      return WRITE_CLOSED;
 	    }
 	}
 

src/keyexchange.h

@@ -42,12 +42,14 @@
 struct keyexchange_algorithm
 {
   int (*init)(struct keyexchange_algorithm *closure,
-	      struct ssh_connection *connection);
+	      struct ssh_connection *connection,
+	      struct signature_algorithm *hostkey_algorithm,
+	      void **algorithms);
 };
 
-#define KEYEXCHANGE_INIT(kex, connection) \
+#define KEYEXCHANGE_INIT(kex, connection, ) \
 ((kex)->init((kex), (connection)))
-     
+
 struct kexinit
 {
   UINT8 cookie[16];

src/read_packet.h

@@ -28,7 +28,6 @@
 
 #include "abstract_io.h"
 #include "abstract_crypto.h"
-#include "newkeys.h"
 
 struct read_packet
 {