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 5900 by doda, Tue Jun 2 09:07:33 2015 UTC revision 5901 by yutakapon, Tue Jun 2 13:43:23 2015 UTC
# Line 2928  static void init_setup_dlg(PTInstVar pva Line 2928  static void init_setup_dlg(PTInstVar pva
2928          HWND hostkeyControl = GetDlgItem(dlg, IDC_SSHHOST_KEY_LIST);          HWND hostkeyControl = GetDlgItem(dlg, IDC_SSHHOST_KEY_LIST);
2929          HWND macControl = GetDlgItem(dlg, IDC_SSHMAC_LIST);          HWND macControl = GetDlgItem(dlg, IDC_SSHMAC_LIST);
2930          HWND compControl = GetDlgItem(dlg, IDC_SSHCOMP_LIST);          HWND compControl = GetDlgItem(dlg, IDC_SSHCOMP_LIST);
2931            HWND hostkeyRotationControl = GetDlgItem(dlg, IDC_HOSTKEY_ROTATION_STATIC);
2932            HWND hostkeyRotationControlList = GetDlgItem(dlg, IDC_HOSTKEY_ROTATION_COMBO);
2933          int i;          int i;
2934          int ch;          int ch;
2935          char uimsg[MAX_UIMSG];          char uimsg[MAX_UIMSG];
2936            char *rotationItem[SSH_UPDATE_HOSTKEYS_MAX] = {
2937                    "No",
2938                    "Yes",
2939                    "Ask",
2940            };
2941            char *rotationItemKey[SSH_UPDATE_HOSTKEYS_MAX] = {
2942                    "DLG_SSHSETUP_HOSTKEY_ROTATION_NO",
2943                    "DLG_SSHSETUP_HOSTKEY_ROTATION_YES",
2944                    "DLG_SSHSETUP_HOSTKEY_ROTATION_ASK",
2945            };
2946    
2947          GetWindowText(dlg, uimsg, sizeof(uimsg));          GetWindowText(dlg, uimsg, sizeof(uimsg));
2948          UTIL_get_lang_msg("DLG_SSHSETUP_TITLE", pvar, uimsg);          UTIL_get_lang_msg("DLG_SSHSETUP_TITLE", pvar, uimsg);
# Line 3035  static void init_setup_dlg(PTInstVar pva Line 3047  static void init_setup_dlg(PTInstVar pva
3047          UTIL_get_lang_msg("BTN_CANCEL", pvar, uimsg);          UTIL_get_lang_msg("BTN_CANCEL", pvar, uimsg);
3048          SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);          SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
3049    
3050            GetDlgItemText(dlg, IDC_HOSTKEY_ROTATION_STATIC, uimsg, sizeof(uimsg));
3051            UTIL_get_lang_msg("DLG_SSHSETUP_HOSTKEY_ROTATION", pvar, uimsg);
3052            SetDlgItemText(dlg, IDC_HOSTKEY_ROTATION_STATIC, pvar->ts->UIMsg);
3053    
3054          SendMessage(compressionControl, TBM_SETRANGE, TRUE, MAKELONG(0, 9));          SendMessage(compressionControl, TBM_SETRANGE, TRUE, MAKELONG(0, 9));
3055          SendMessage(compressionControl, TBM_SETPOS, TRUE,          SendMessage(compressionControl, TBM_SETPOS, TRUE,
3056                      pvar->settings.CompressionLevel);                      pvar->settings.CompressionLevel);
# Line 3176  static void init_setup_dlg(PTInstVar pva Line 3192  static void init_setup_dlg(PTInstVar pva
3192          if (pvar->settings.VerifyHostKeyDNS) {          if (pvar->settings.VerifyHostKeyDNS) {
3193                  CheckDlgButton(dlg, IDC_VERIFYHOSTKEYDNS, TRUE);                  CheckDlgButton(dlg, IDC_VERIFYHOSTKEYDNS, TRUE);
3194          }          }
3195    
3196            // hostkey rotation(OpenSSH 6.8)
3197            for (i = 0; i < SSH_UPDATE_HOSTKEYS_MAX; i++) {
3198                    UTIL_get_lang_msg(rotationItemKey[i], pvar, rotationItem[i]);
3199                    SendMessage(hostkeyRotationControlList, CB_INSERTSTRING, i, (LPARAM)pvar->ts->UIMsg);
3200            }
3201            ch = pvar->settings.UpdateHostkeys;
3202            if (!(ch >= 0 && ch < SSH_UPDATE_HOSTKEYS_MAX))
3203                    ch = 0;
3204            SendMessage(hostkeyRotationControlList, CB_SETCURSEL, ch, 0);
3205    
3206  }  }
3207    
3208  void get_teraterm_dir_relative_name(char FAR * buf, int bufsize,  void get_teraterm_dir_relative_name(char FAR * buf, int bufsize,
# Line 3429  static void complete_setup_dlg(PTInstVar Line 3456  static void complete_setup_dlg(PTInstVar
3456          pvar->settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARDAGENT);          pvar->settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARDAGENT);
3457          pvar->settings.ForwardAgentConfirm = IsDlgButtonChecked(dlg, IDC_FORWARDAGENTCONFIRM);          pvar->settings.ForwardAgentConfirm = IsDlgButtonChecked(dlg, IDC_FORWARDAGENTCONFIRM);
3458          pvar->settings.VerifyHostKeyDNS = IsDlgButtonChecked(dlg, IDC_VERIFYHOSTKEYDNS);          pvar->settings.VerifyHostKeyDNS = IsDlgButtonChecked(dlg, IDC_VERIFYHOSTKEYDNS);
3459    
3460            // hostkey rotation(OpenSSH 6.8)
3461            i = SendMessage(GetDlgItem(dlg, IDC_HOSTKEY_ROTATION_COMBO), CB_GETCURSEL, 0, 0);
3462            if (!(i >= 0 && i < SSH_UPDATE_HOSTKEYS_MAX))
3463                    i = 0;
3464            pvar->settings.UpdateHostkeys = i;
3465  }  }
3466    
3467  static void move_cur_sel_delta(HWND listbox, int delta)  static void move_cur_sel_delta(HWND listbox, int delta)
# Line 3584  static BOOL CALLBACK TTXSetupDlg(HWND dl Line 3617  static BOOL CALLBACK TTXSetupDlg(HWND dl
3617                          SendDlgItemMessage(dlg, IDC_NOTICEBANNER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDC_NOTICEBANNER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
3618                          SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
3619                          SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));                          SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
3620    
3621                            SendDlgItemMessage(dlg, IDC_HOSTKEY_ROTATION_STATIC, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE, 0));
3622                            SendDlgItemMessage(dlg, IDC_HOSTKEY_ROTATION_COMBO, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE, 0));
3623                  }                  }
3624                  else {                  else {
3625                          DlgSetupFont = NULL;                          DlgSetupFont = NULL;

Legend:
Removed from v.5900  
changed lines
  Added in v.5901

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