Develop and Download Open Source Software

Tera Term

Browse Subversion Repository

/[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c

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

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

revision 3124 by yutakapon, Thu Mar 20 14:31:38 2008 UTC revision 3126 by maya, Mon May 19 08:37:18 2008 UTC
# Line 1541  static BOOL handle_server_public_key(PTI Line 1541  static BOOL handle_server_public_key(PTI
1541          hostkey.bits = get_uint32(inmsg + host_key_bits_pos);          hostkey.bits = get_uint32(inmsg + host_key_bits_pos);
1542          hostkey.exp = inmsg + host_key_bits_pos + 4;          hostkey.exp = inmsg + host_key_bits_pos + 4;
1543          hostkey.mod = inmsg + host_key_public_modulus_pos;          hostkey.mod = inmsg + host_key_public_modulus_pos;
1544          HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, &hostkey);          HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, pvar->ssh_state.tcpport, &hostkey);
1545    
1546          return FALSE;          return FALSE;
1547  }  }
# Line 1614  static void init_protocol(PTInstVar pvar Line 1614  static void init_protocol(PTInstVar pvar
1614          CRYPT_initialize_random_numbers(pvar);          CRYPT_initialize_random_numbers(pvar);
1615    
1616          // known_hostsファイルからホスト公開鍵を先読みしておく          // known_hostsファイルからホスト公開鍵を先読みしておく
1617          HOSTS_prefetch_host_key(pvar, pvar->ssh_state.hostname);          HOSTS_prefetch_host_key(pvar, pvar->ssh_state.hostname, pvar->ssh_state.tcpport);
1618    
1619          /* while we wait for a response from the server... */          /* while we wait for a response from the server... */
1620    
# Line 2579  void SSH_init(PTInstVar pvar) Line 2579  void SSH_init(PTInstVar pvar)
2579  void SSH_open(PTInstVar pvar)  void SSH_open(PTInstVar pvar)
2580  {  {
2581          pvar->ssh_state.hostname = _strdup(pvar->ts->HostName);          pvar->ssh_state.hostname = _strdup(pvar->ts->HostName);
2582            pvar->ssh_state.tcpport  = pvar->ts->TCPPort;
2583          pvar->ssh_state.win_cols = pvar->ts->TerminalWidth;          pvar->ssh_state.win_cols = pvar->ts->TerminalWidth;
2584          pvar->ssh_state.win_rows = pvar->ts->TerminalHeight;          pvar->ssh_state.win_rows = pvar->ts->TerminalHeight;
2585  }  }
# Line 5622  static BOOL handle_SSH2_dh_kex_reply(PTI Line 5623  static BOOL handle_SSH2_dh_kex_reply(PTI
5623                  emsg = emsg_tmp;                  emsg = emsg_tmp;
5624                  goto error;                  goto error;
5625          }          }
5626          HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, &hostkey);          HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, pvar->ssh_state.tcpport, &hostkey);
5627    
5628    
5629          dh_server_pub = BN_new();          dh_server_pub = BN_new();
# Line 5949  static BOOL handle_SSH2_dh_gex_reply(PTI Line 5950  static BOOL handle_SSH2_dh_gex_reply(PTI
5950                  emsg = emsg_tmp;                  emsg = emsg_tmp;
5951                  goto error;                  goto error;
5952          }          }
5953          HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, &hostkey);          HOSTS_check_host_key(pvar, pvar->ssh_state.hostname, pvar->ssh_state.tcpport, &hostkey);
5954    
5955    
5956          dh_server_pub = BN_new();          dh_server_pub = BN_new();
Legend:
Removed from v.3124  
changed lines
  Added in v.3126
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help