Develop and Download Open Source Software

Browse Subversion Repository

Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 7012 by doda, Tue Jan 9 09:06:04 2018 UTC revision 7013 by doda, Tue Jan 9 09:06:08 2018 UTC
# Line 4845  static BOOL handle_SSH2_kexinit(PTInstVa Line 4845  static BOOL handle_SSH2_kexinit(PTInstVa
4845                  SSH2_send_kexinit(pvar);                  SSH2_send_kexinit(pvar);
4846          }          }
4847    
4848          if (pvar->peer_kex != NULL) { // already allocated          data = pvar->ssh_state.payload;
4849                  buffer_free(pvar->peer_kex);          len = pvar->ssh_state.payloadlen - 1;
4850    
4851            // KEX の最後で hash (session-id) を計算するのに使うので保存しておく
4852            if (pvar->peer_kex != NULL) {
4853                    // already allocated
4854                    buffer_clear(pvar->peer_kex);
4855          }          }
4856          pvar->peer_kex = buffer_init();          else {
4857          if (pvar->peer_kex == NULL) {                  pvar->peer_kex = buffer_init();
4858                  msg = "Out of memory @ handle_SSH2_kexinit()";                  if (pvar->peer_kex == NULL) {
4859                  goto error;                          msg = __FUNCTION__ ": Out of memory";
4860                            goto error;
4861                    }
4862          }          }
4863          // [-2]:padding size          buffer_append(pvar->peer_kex, data, len);
 //      len = pvar->ssh_state.payloadlen + pvar->ssh_state.payload[-2] + 1;  
         len = pvar->ssh_state.payloadlen - 1;  
 //      buffer_append(pvar->peer_kex, &pvar->ssh_state.payload[-6], len);  
         buffer_append(pvar->peer_kex, pvar->ssh_state.payload, len);  
         //write_buffer_file(&pvar->ssh_state.payload[-6], len);  
4864    
4865          // TODO: buffer overrun check          // TODO: buffer overrun check
4866    

Legend:
Removed from v.7012  
changed lines
  Added in v.7013

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26