Develop and Download Open Source Software

Browse Subversion Repository

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

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

revision 3107 by yutakapon, Mon Feb 11 12:26:39 2008 UTC revision 3108 by maya, Tue Feb 12 23:11:49 2008 UTC
# Line 296  static void read_ssh_options(PTInstVar p Line 296  static void read_ssh_options(PTInstVar p
296          if (settings->DefaultAuthMethod != SSH_AUTH_PASSWORD          if (settings->DefaultAuthMethod != SSH_AUTH_PASSWORD
297           && settings->DefaultAuthMethod != SSH_AUTH_RSA           && settings->DefaultAuthMethod != SSH_AUTH_RSA
298           && settings->DefaultAuthMethod != SSH_AUTH_TIS  // add (2005.3.12 yutaka)           && settings->DefaultAuthMethod != SSH_AUTH_TIS  // add (2005.3.12 yutaka)
299           && settings->DefaultAuthMethod != SSH_AUTH_RHOSTS) {           && settings->DefaultAuthMethod != SSH_AUTH_RHOSTS
300             && settings->DefaultAuthMethod != SSH_AUTH_PAGEANT) {
301                  /* this default can never be SSH_AUTH_RHOSTS_RSA because that is not a                  /* this default can never be SSH_AUTH_RHOSTS_RSA because that is not a
302                     selection in the dialog box; SSH_AUTH_RHOSTS_RSA is automatically chosen                     selection in the dialog box; SSH_AUTH_RHOSTS_RSA is automatically chosen
303                     when the dialog box has rhosts selected and an host private key file                     when the dialog box has rhosts selected and an host private key file
# Line 1545  static int parse_option(PTInstVar pvar, Line 1546  static int parse_option(PTInstVar pvar,
1546                                  //pvar->auth_state.cur_cred.method = SSH_AUTH_RSA;                                  //pvar->auth_state.cur_cred.method = SSH_AUTH_RSA;
1547                                  pvar->ssh2_authmethod = SSH_AUTH_RSA;                                  pvar->ssh2_authmethod = SSH_AUTH_RSA;
1548    
1549                            } else if (MATCH_STR(option + 5, "=pageant") == 0) { // 公開鍵認証 by Pageant
1550                                    //pvar->auth_state.cur_cred.method = SSH_AUTH_RSA;
1551                                    pvar->ssh2_authmethod = SSH_AUTH_PAGEANT;
1552    
1553                          } else {                          } else {
1554                                  // TODO:                                  // TODO:
1555    
# Line 3683  static void PASCAL FAR TTXSetCommandLine Line 3688  static void PASCAL FAR TTXSetCommandLine
3688                                              " /auth=challenge /user=%s /passwd=%s", pvar->auth_state.user, mark);                                              " /auth=challenge /user=%s /passwd=%s", pvar->auth_state.user, mark);
3689                                  strncat_s(cmd, cmdlen, tmp, _TRUNCATE);                                  strncat_s(cmd, cmdlen, tmp, _TRUNCATE);
3690    
3691                            } else if (pvar->auth_state.cur_cred.method == SSH_AUTH_PAGEANT) {
3692                                    _snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
3693                                                " /auth=pageant /user=%s", pvar->auth_state.user);
3694                                    strncat_s(cmd, cmdlen, tmp, _TRUNCATE);
3695    
3696                          } else {                          } else {
3697                                  // don't come here                                  // don't come here
3698    

Legend:
Removed from v.3107  
changed lines
  Added in v.3108

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