src/usr.bin/ssh/kex.c - diff

Return to kex.c CVS log

Up to [local] / src / usr.bin / ssh

-version 1.86, 2010/09/22 05:01:29
+version 1.87, 2012/08/17 01:22:56
 Line 231
 Line 231
 Line 231
                  packet_get_char();
          for (i = 0; i < PROPOSAL_MAX; i++)
                  xfree(packet_get_string(NULL));
-         (void) packet_get_char();
+         /*
-         (void) packet_get_int();
+          * XXX RFC4253 sec 7: "each side MAY guess" - currently no supported
+          * KEX method has the server move first, but a server might be using
+          * a custom method or one that we otherwise don't support. We should
+          * be prepared to remember first_kex_follows here so we can eat a
+          * packet later.
+          * XXX2 - RFC4253 is kind of ambiguous on what first_kex_follows means
+          * for cases where the server *doesn't* go first. I guess we should
+          * ignore it when it is set for these cases, which is what we do now.
+          */
+         (void) packet_get_char();       /* first_kex_follows */
+         (void) packet_get_int();        /* reserved */
          packet_check_eom();
          kex_kexinit_finish(kex);