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

Diff for /src/usr.bin/ssh/kex.c between version 1.116 and 1.117

version 1.116, 2016/01/14 16:17:39 version 1.117, 2016/02/08 10:57:07
Line 585 
Line 585 
         return 0;          return 0;
 }  }
   
   /*
    * Request key re-exchange, returns 0 on success or a ssherr.h error
    * code otherwise. Must not be called if KEX is incomplete or in-progress.
    */
   int
   kex_start_rekex(struct ssh *ssh)
   {
           if (ssh->kex == NULL) {
                   error("%s: no kex", __func__);
                   return SSH_ERR_INTERNAL_ERROR;
           }
           if (ssh->kex->done == 0) {
                   error("%s: requested twice", __func__);
                   return SSH_ERR_INTERNAL_ERROR;
           }
           ssh->kex->done = 0;
           return kex_send_kexinit(ssh);
   }
   
 static int  static int
 choose_enc(struct sshenc *enc, char *client, char *server)  choose_enc(struct sshenc *enc, char *client, char *server)
 {  {

Legend:
Removed from v.1.116  
changed lines
  Added in v.1.117