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

Diff for /src/usr.bin/ssh/packet.c between version 1.206 and 1.207

version 1.206, 2015/02/09 23:22:37 version 1.207, 2015/02/11 01:20:38
Line 284 
Line 284 
             (r = cipher_init(&state->receive_context, none,              (r = cipher_init(&state->receive_context, none,
             (const u_char *)"", 0, NULL, 0, CIPHER_DECRYPT)) != 0) {              (const u_char *)"", 0, NULL, 0, CIPHER_DECRYPT)) != 0) {
                 error("%s: cipher_init failed: %s", __func__, ssh_err(r));                  error("%s: cipher_init failed: %s", __func__, ssh_err(r));
                 free(ssh);  
                 return NULL;                  return NULL;
         }          }
         state->newkeys[MODE_IN] = state->newkeys[MODE_OUT] = NULL;          state->newkeys[MODE_IN] = state->newkeys[MODE_OUT] = NULL;
         deattack_init(&state->deattack);          deattack_init(&state->deattack);
           /*
            * Cache the IP address of the remote connection for use in error
            * messages that might be generated after the connection has closed.
            */
           (void)ssh_remote_ipaddr(ssh);
         return ssh;          return ssh;
 }  }
   
Line 1263 
Line 1267 
          * Since we are blocking, ensure that all written packets have           * Since we are blocking, ensure that all written packets have
          * been sent.           * been sent.
          */           */
         if ((r = ssh_packet_write_wait(ssh)) != 0) {          if ((r = ssh_packet_write_wait(ssh)) != 0)
                 free(setp);  
                 return r;                  return r;
         }  
   
         /* Stay in the loop until we have received a complete packet. */          /* Stay in the loop until we have received a complete packet. */
         for (;;) {          for (;;) {
Legend:
Removed from v.1.206  
changed lines
  Added in v.1.207