Develop and Download Open Source Software

Tera Term

Browse Subversion Repository

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

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

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

revision 3003 by maya, Mon Aug 20 14:21:57 2007 UTC revision 3011 by maya, Sat Sep 22 16:10:45 2007 UTC
# Line 313  static void init_auth_dlg(PTInstVar pvar Line 313  static void init_auth_dlg(PTInstVar pvar
313  #endif  #endif
314    
315  #if 1  #if 1
         // パスワード認証を試す前に、keyboard-interactiveメソッドを試す場合は、ラベル名を  
         // 変更する。(2005.3.12 yutaka)  
         if (pvar->settings.ssh2_keyboard_interactive == 1) {  
                 UTIL_get_lang_msg("DLG_AUTH_METHOD_PASSWORD_KBDINT", pvar,  
                                   "Use p&lain password to log in (with keyboard-interactive)");  
                 SetDlgItemText(dlg, IDC_SSHUSEPASSWORD, pvar->ts->UIMsg);  
         }  
   
316          if (pvar->settings.ssh_protocol_version == 1) {          if (pvar->settings.ssh_protocol_version == 1) {
317                  UTIL_get_lang_msg("DLG_AUTH_METHOD_CHALLENGE1", pvar,                  UTIL_get_lang_msg("DLG_AUTH_METHOD_CHALLENGE1", pvar,
318                                    "Use challenge/response to log in(&TIS)");                                    "Use challenge/response to log in(&TIS)");
# Line 987  static void init_default_auth_dlg(PTInst Line 979  static void init_default_auth_dlg(PTInst
979          GetDlgItemText(dlg, IDC_SSHUSEPASSWORD, uimsg, sizeof(uimsg));          GetDlgItemText(dlg, IDC_SSHUSEPASSWORD, uimsg, sizeof(uimsg));
980          UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_PASSWORD", pvar, uimsg);          UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_PASSWORD", pvar, uimsg);
981          SetDlgItemText(dlg, IDC_SSHUSEPASSWORD, pvar->ts->UIMsg);          SetDlgItemText(dlg, IDC_SSHUSEPASSWORD, pvar->ts->UIMsg);
         GetDlgItemText(dlg, IDC_KEYBOARD_INTERACTIVE_CHECK, uimsg, sizeof(uimsg));  
         UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_PASSWORD_KBDINT", pvar, uimsg);  
         SetDlgItemText(dlg, IDC_KEYBOARD_INTERACTIVE_CHECK, pvar->ts->UIMsg);  
982          GetDlgItemText(dlg, IDC_SSHUSERSA, uimsg, sizeof(uimsg));          GetDlgItemText(dlg, IDC_SSHUSERSA, uimsg, sizeof(uimsg));
983          UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_RSA", pvar, uimsg);          UTIL_get_lang_msg("DLG_AUTHSETUP_METHOD_RSA", pvar, uimsg);
984          SetDlgItemText(dlg, IDC_SSHUSERSA, pvar->ts->UIMsg);          SetDlgItemText(dlg, IDC_SSHUSERSA, pvar->ts->UIMsg);
# Line 1042  static void init_default_auth_dlg(PTInst Line 1031  static void init_default_auth_dlg(PTInst
1031                         pvar->settings.DefaultRhostsHostPrivateKeyFile);                         pvar->settings.DefaultRhostsHostPrivateKeyFile);
1032          SetDlgItemText(dlg, IDC_LOCALUSERNAME,          SetDlgItemText(dlg, IDC_LOCALUSERNAME,
1033                         pvar->settings.DefaultRhostsLocalUserName);                         pvar->settings.DefaultRhostsLocalUserName);
   
         // SSH2 keyboard-interactive method (2005.2.22 yutaka)  
         if (pvar->settings.ssh2_keyboard_interactive) {  
                 SendMessage(GetDlgItem(dlg, IDC_KEYBOARD_INTERACTIVE_CHECK), BM_SETCHECK, BST_CHECKED, 0);  
         }  
   
1034  }  }
1035    
1036  static BOOL end_default_auth_dlg(PTInstVar pvar, HWND dlg)  static BOOL end_default_auth_dlg(PTInstVar pvar, HWND dlg)
# Line 1078  static BOOL end_default_auth_dlg(PTInstV Line 1061  static BOOL end_default_auth_dlg(PTInstV
1061                         pvar->settings.DefaultRhostsLocalUserName,                         pvar->settings.DefaultRhostsLocalUserName,
1062                         sizeof(pvar->settings.DefaultRhostsLocalUserName));                         sizeof(pvar->settings.DefaultRhostsLocalUserName));
1063    
         // SSH2 keyboard-interactive method (2005.2.22 yutaka)  
         {  
                 LRESULT ret;  
                 ret = SendMessage(GetDlgItem(dlg, IDC_KEYBOARD_INTERACTIVE_CHECK), BM_GETCHECK, 0, 0);  
                 if (ret & BST_CHECKED) {  
                         pvar->settings.ssh2_keyboard_interactive = 1;  
                 } else {  
                         pvar->settings.ssh2_keyboard_interactive = 0;  
                 }  
         }  
   
1064          EndDialog(dlg, 1);          EndDialog(dlg, 1);
1065          return TRUE;          return TRUE;
1066  }  }
# Line 1114  static BOOL CALLBACK default_auth_dlg_pr Line 1086  static BOOL CALLBACK default_auth_dlg_pr
1086                          SendDlgItemMessage(dlg, IDC_SSHUSERNAMELABEL, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDC_SSHUSERNAMELABEL, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));
1087                          SendDlgItemMessage(dlg, IDC_SSHUSERNAME, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDC_SSHUSERNAME, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));
1088                          SendDlgItemMessage(dlg, IDC_SSHUSEPASSWORD, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDC_SSHUSEPASSWORD, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));
                         SendDlgItemMessage(dlg, IDC_KEYBOARD_INTERACTIVE_CHECK, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));  
1089                          SendDlgItemMessage(dlg, IDC_SSHUSERSA, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDC_SSHUSERSA, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));
1090                          SendDlgItemMessage(dlg, IDC_CHOOSERSAFILE, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDC_CHOOSERSAFILE, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));
1091                          SendDlgItemMessage(dlg, IDC_RSAFILENAME, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDC_RSAFILENAME, WM_SETFONT, (WPARAM)DlgAuthSetupFont, MAKELPARAM(TRUE,0));
# Line 1266  void AUTH_get_auth_info(PTInstVar pvar, Line 1237  void AUTH_get_auth_info(PTInstVar pvar,
1237                          if (pvar->auth_state.cur_cred.method == SSH_AUTH_PASSWORD ||                          if (pvar->auth_state.cur_cred.method == SSH_AUTH_PASSWORD ||
1238                                  pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {                                  pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
1239                                  // keyboard-interactiveメソッドを追加 (2005.1.24 yutaka)                                  // keyboard-interactiveメソッドを追加 (2005.1.24 yutaka)
1240                                  if (pvar->keyboard_interactive_done == 1 ||                                  if (pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
                                         pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {  
1241                                          method = "keyboard-interactive";                                          method = "keyboard-interactive";
1242                                  } else {                                  } else {
1243                                          method = get_auth_method_name(pvar->auth_state.cur_cred.method);                                          method = get_auth_method_name(pvar->auth_state.cur_cred.method);
Legend:
Removed from v.3003  
changed lines
  Added in v.3011
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help