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 4304 by maya, Mon Feb 14 09:09:07 2011 UTC revision 4305 by maya, Mon Feb 14 14:30:19 2011 UTC
# Line 5083  static BOOL handle_SSH2_dh_kex_reply(PTI Line 5083  static BOOL handle_SSH2_dh_kex_reply(PTI
5083                             server_host_key_blob, bloblen,                             server_host_key_blob, bloblen,
5084                             pvar->kexdh->pub_key,                             pvar->kexdh->pub_key,
5085                             dh_server_pub,                             dh_server_pub,
5086                             share_key);                             share_key,
5087                               &hashlen);
5088    
         hashlen = EVP_MD_size(ssh2_kex_algorithms[pvar->kex_type].evp_md());  
5089          //debug_print(30, hash, hashlen);          //debug_print(30, hash, hashlen);
5090          //debug_print(31, pvar->client_version_string, strlen(pvar->client_version_string));          //debug_print(31, pvar->client_version_string, strlen(pvar->client_version_string));
5091          //debug_print(32, pvar->server_version_string, strlen(pvar->server_version_string));          //debug_print(32, pvar->server_version_string, strlen(pvar->server_version_string));
# Line 5360  static BOOL handle_SSH2_dh_gex_reply(PTI Line 5360  static BOOL handle_SSH2_dh_gex_reply(PTI
5360          // ハッシュの計算          // ハッシュの計算
5361          /* calc and verify H */          /* calc and verify H */
5362          hash = kex_dh_gex_hash(          hash = kex_dh_gex_hash(
5363                    ssh2_kex_algorithms[pvar->kex_type].evp_md(),
5364                  pvar->client_version_string,                  pvar->client_version_string,
5365                  pvar->server_version_string,                  pvar->server_version_string,
5366                  buffer_ptr(pvar->my_kex),  buffer_len(pvar->my_kex),                  buffer_ptr(pvar->my_kex),  buffer_len(pvar->my_kex),
# Line 5372  static BOOL handle_SSH2_dh_gex_reply(PTI Line 5373  static BOOL handle_SSH2_dh_gex_reply(PTI
5373                  pvar->kexdh->p,                  pvar->kexdh->p,
5374                  pvar->kexdh->g,                  pvar->kexdh->g,
5375                  pvar->kexdh->pub_key,                  pvar->kexdh->pub_key,
                 pvar->kex_type,  
5376                  /////// KEXGEX                  /////// KEXGEX
5377                  dh_server_pub,                  dh_server_pub,
5378                  share_key);                  share_key,
5379                    &hashlen);
5380    
         hashlen = EVP_MD_size(ssh2_kex_algorithms[pvar->kex_type].evp_md());  
5381          {          {
5382                  push_memdump("DH_GEX_REPLY kex_dh_gex_hash", "my_kex", buffer_ptr(pvar->my_kex), buffer_len(pvar->my_kex));                  push_memdump("DH_GEX_REPLY kex_dh_gex_hash", "my_kex", buffer_ptr(pvar->my_kex), buffer_len(pvar->my_kex));
5383                  push_memdump("DH_GEX_REPLY kex_dh_gex_hash", "peer_kex", buffer_ptr(pvar->peer_kex), buffer_len(pvar->peer_kex));                  push_memdump("DH_GEX_REPLY kex_dh_gex_hash", "peer_kex", buffer_ptr(pvar->peer_kex), buffer_len(pvar->peer_kex));

Legend:
Removed from v.4304  
changed lines
  Added in v.4305

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