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 5056 by maya, Fri Nov 2 13:24:06 2012 UTC revision 5545 by yutakapon, Mon Mar 17 16:06:58 2014 UTC
# Line 377  static int get_key_file_name(HWND parent Line 377  static int get_key_file_name(HWND parent
377          // フィルタの追加 (2004.12.19 yutaka)          // フィルタの追加 (2004.12.19 yutaka)
378          // 3ファイルフィルタの追加 (2005.4.26 yutaka)          // 3ファイルフィルタの追加 (2005.4.26 yutaka)
379          UTIL_get_lang_msg("FILEDLG_OPEN_PRIVATEKEY_FILTER", pvar,          UTIL_get_lang_msg("FILEDLG_OPEN_PRIVATEKEY_FILTER", pvar,
380                            "identity files\\0identity;id_rsa;id_dsa;id_ecdsa;*.ppk\\0identity(RSA1)\\0identity\\0id_rsa(SSH2)\\0id_rsa\\0id_dsa(SSH2)\\0id_dsa\\0id_ecdsa(SSH2)\\0id_ecdsa\\0PuTTY(*.ppk)\\0*.ppk\\0all(*.*)\\0*.*\\0\\0");                            "identity files\\0identity;id_rsa;id_dsa;id_ecdsa;id_ed25519;*.ppk\\0identity(RSA1)\\0identity\\0id_rsa(SSH2)\\0id_rsa\\0id_dsa(SSH2)\\0id_dsa\\0id_ecdsa(SSH2)\\0id_ecdsa\\0id_ed25519(SSH2)\\0id_ed25519\\0PuTTY(*.ppk)\\0*.ppk\\0all(*.*)\\0*.*\\0\\0");
381          memcpy(filter, pvar->ts->UIMsg, sizeof(filter));          memcpy(filter, pvar->ts->UIMsg, sizeof(filter));
382          params.lpstrFilter = filter;          params.lpstrFilter = filter;
383          params.lpstrCustomFilter = NULL;          params.lpstrCustomFilter = NULL;
# Line 1505  static const char *get_auth_method_name( Line 1505  static const char *get_auth_method_name(
1505  void AUTH_get_auth_info(PTInstVar pvar, char FAR * dest, int len)  void AUTH_get_auth_info(PTInstVar pvar, char FAR * dest, int len)
1506  {  {
1507          const char *method = "unknown";          const char *method = "unknown";
1508            char buf[256];
1509    
1510          if (pvar->auth_state.user == NULL) {          if (pvar->auth_state.user == NULL) {
1511                  strncpy_s(dest, len, "None", _TRUNCATE);                  strncpy_s(dest, len, "None", _TRUNCATE);
# Line 1531  void AUTH_get_auth_info(PTInstVar pvar, Line 1532  void AUTH_get_auth_info(PTInstVar pvar,
1532    
1533                          } else {                          } else {
1534                                  if (pvar->auth_state.cur_cred.method == SSH_AUTH_RSA) {                                  if (pvar->auth_state.cur_cred.method == SSH_AUTH_RSA) {
1535                                          method = ssh_key_type(pvar->auth_state.cur_cred.key_pair);                                          Key *k = pvar->auth_state.cur_cred.key_pair;
1536                                            method = ssh_key_type(k);
1537                                            if (k->bcrypt_kdf) {
1538                                                    _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s(bcrypt KDF)", method);
1539                                                    method = buf;
1540                                            }
1541    
1542                                  }                                  }
1543                                  else if (pvar->auth_state.cur_cred.method == SSH_AUTH_PAGEANT) {                                  else if (pvar->auth_state.cur_cred.method == SSH_AUTH_PAGEANT) {
1544                                          int len = get_uint32_MSBfirst(pvar->pageant_curkey + 4);                                          int len = get_uint32_MSBfirst(pvar->pageant_curkey + 4);
Legend:
Removed from v.5056  
changed lines
  Added in v.5545
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help