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 2834 by yutakakn, Sun Jul 10 06:44:48 2005 UTC revision 2835 by yutakakn, Fri Jul 15 14:58:04 2005 UTC
# Line 519  static BOOL grab_payload(PTInstVar pvar, Line 519  static BOOL grab_payload(PTInstVar pvar,
519          } else {          } else {
520                  pvar->ssh_state.payload_grabbed += num_bytes;                  pvar->ssh_state.payload_grabbed += num_bytes;
521                  if (pvar->ssh_state.payload_grabbed > in_buffer) {                  if (pvar->ssh_state.payload_grabbed > in_buffer) {
522                          notify_fatal_error(pvar, "Received truncated packet");                          char buf[128];
523                            _snprintf(buf, sizeof(buf), "Received truncated packet (%ld > %d) @ grab_payload()",
524                                    pvar->ssh_state.payload_grabbed, in_buffer);
525                            notify_fatal_error(pvar, buf);
526                          return FALSE;                          return FALSE;
527                  } else {                  } else {
528                          return TRUE;                          return TRUE;
# Line 538  static BOOL grab_payload_limited(PTInstV Line 541  static BOOL grab_payload_limited(PTInstV
541                  return FALSE;                  return FALSE;
542          } else {          } else {
543                  if (pvar->ssh_state.payload_grabbed > in_buffer) {                  if (pvar->ssh_state.payload_grabbed > in_buffer) {
544                          notify_fatal_error(pvar, "Received truncated packet");                          char buf[128];
545                            _snprintf(buf, sizeof(buf), "Received truncated packet (%ld > %d) @ grab_payload_limited()",
546                                    pvar->ssh_state.payload_grabbed, in_buffer);
547                            notify_fatal_error(pvar, buf);
548                          return FALSE;                          return FALSE;
549                  } else {                  } else {
550                          return TRUE;                          return TRUE;
# Line 1002  static BOOL handle_auth_failure(PTInstVa Line 1008  static BOOL handle_auth_failure(PTInstVa
1008          notify_verbose_message(pvar, "Authentication failed",          notify_verbose_message(pvar, "Authentication failed",
1009                                                     LOG_LEVEL_VERBOSE);                                                     LOG_LEVEL_VERBOSE);
1010    
1011            // retry countの追加 (2005.7.15 yutaka)
1012            pvar->userauth_retry_count++;
1013    
1014          AUTH_set_generic_mode(pvar);          AUTH_set_generic_mode(pvar);
1015          AUTH_advance_to_next_cred(pvar);          AUTH_advance_to_next_cred(pvar);
1016          pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;          pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;
# Line 5846  static BOOL handle_SSH2_open_confirm(PTI Line 5855  static BOOL handle_SSH2_open_confirm(PTI
5855          buffer_put_int(msg, pvar->ssh_state.win_rows);  // lines          buffer_put_int(msg, pvar->ssh_state.win_rows);  // lines
5856          buffer_put_int(msg, 480);  // XXX:          buffer_put_int(msg, 480);  // XXX:
5857          buffer_put_int(msg, 640);  // XXX:          buffer_put_int(msg, 640);  // XXX:
5858            // TODO: TTY modeはここで渡すこと。
5859          s = "";          s = "";
5860          buffer_put_string(msg, s, strlen(s));            buffer_put_string(msg, s, strlen(s));  
5861    
5862          len = buffer_len(msg);          len = buffer_len(msg);
5863          outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);          outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);
5864          memcpy(outmsg, buffer_ptr(msg), len);          memcpy(outmsg, buffer_ptr(msg), len);
# Line 6372  static BOOL handle_SSH2_window_adjust(PT Line 6383  static BOOL handle_SSH2_window_adjust(PT
6383    
6384  /*  /*
6385   * $Log: not supported by cvs2svn $   * $Log: not supported by cvs2svn $
6386     * Revision 1.35  2005/07/10 06:44:48  yutakakn
6387     * キー再作成時にパケット圧縮が正常に動作せず、サーバ側で正しく解凍できないバグを修正。
6388     *
6389   * Revision 1.34  2005/07/09 17:08:47  yutakakn   * Revision 1.34  2005/07/09 17:08:47  yutakakn
6390   * SSH2 packet compressionをサポートした。   * SSH2 packet compressionをサポートした。
6391   *   *

Legend:
Removed from v.2834  
changed lines
  Added in v.2835

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