[BACK]Return to sshconnect2.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sshconnect2.c between version 1.135.2.1 and 1.136

version 1.135.2.1, 2004/08/19 04:13:27 version 1.136, 2004/04/08 16:08:21
Line 41 
Line 41 
 #include "authfd.h"  #include "authfd.h"
 #include "log.h"  #include "log.h"
 #include "readconf.h"  #include "readconf.h"
 #include "misc.h"  #include "readpass.h"
 #include "match.h"  #include "match.h"
 #include "dispatch.h"  #include "dispatch.h"
 #include "canohost.h"  #include "canohost.h"
Line 118 
Line 118 
         /* start key exchange */          /* start key exchange */
         kex = kex_setup(myproposal);          kex = kex_setup(myproposal);
         kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;          kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
         kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;  
         kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;          kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
         kex->client_version_string=client_version_string;          kex->client_version_string=client_version_string;
         kex->server_version_string=server_version_string;          kex->server_version_string=server_version_string;
Line 457 
Line 456 
          * moved to the end of the queue.  this also avoids confusion by           * moved to the end of the queue.  this also avoids confusion by
          * duplicate keys           * duplicate keys
          */           */
         TAILQ_FOREACH_REVERSE(id, &authctxt->keys, next, idlist) {          TAILQ_FOREACH_REVERSE(id, &authctxt->keys, idlist, next) {
                 if (key_equal(key, id->key)) {                  if (key_equal(key, id->key)) {
                         sent = sign_and_send_pubkey(authctxt, id);                          sent = sign_and_send_pubkey(authctxt, id);
                         break;                          break;

Legend:
Removed from v.1.135.2.1  
changed lines
  Added in v.1.136