#include "ssh.h"
#include "putty.h"
#include "win_res.h"
+#include "storage.h"
-#define NPANELS 8
-#define MAIN_NPANELS 8
-#define RECONF_NPANELS 5
-
-static const char *const puttystr = PUTTY_REG_POS "\\Sessions";
+#define NPANELS 9
+#define MAIN_NPANELS 9
+#define RECONF_NPANELS 6
static char **events = NULL;
static int nevents = 0, negsize = 0;
static HWND logbox = NULL, abtbox = NULL;
-static char hex[16] = "0123456789ABCDEF";
-
-static void mungestr(char *in, char *out) {
- int candot = 0;
-
- while (*in) {
- if (*in == ' ' || *in == '\\' || *in == '*' || *in == '?' ||
- *in == '%' || *in < ' ' || *in > '~' || (*in == '.' && !candot)) {
- *out++ = '%';
- *out++ = hex[((unsigned char)*in) >> 4];
- *out++ = hex[((unsigned char)*in) & 15];
- } else
- *out++ = *in;
- in++;
- candot = 1;
- }
- *out = '\0';
- return;
-}
-
-static void unmungestr(char *in, char *out) {
- while (*in) {
- if (*in == '%' && in[1] && in[2]) {
- int i, j;
-
- i = in[1] - '0'; i -= (i > 9 ? 7 : 0);
- j = in[2] - '0'; j -= (j > 9 ? 7 : 0);
-
- *out++ = (i<<4) + j;
- in += 3;
- } else
- *out++ = *in++;
- }
- *out = '\0';
- return;
-}
-
-static void wpps(HKEY key, LPCTSTR name, LPCTSTR value) {
- RegSetValueEx(key, name, 0, REG_SZ, value, 1+strlen(value));
-}
-
-static void wppi(HKEY key, LPCTSTR name, int value) {
- RegSetValueEx(key, name, 0, REG_DWORD,
- (CONST BYTE *)&value, sizeof(value));
-}
-
-static void gpps(HKEY key, LPCTSTR name, LPCTSTR def,
- LPTSTR val, int len) {
- DWORD type, size;
- size = len;
-
- if (key == NULL ||
- RegQueryValueEx(key, name, 0, &type, val, &size) != ERROR_SUCCESS ||
- type != REG_SZ) {
+static void gpps(void *handle, char *name, char *def, char *val, int len) {
+ if (!read_setting_s(handle, name, val, len)) {
strncpy(val, def, len);
val[len-1] = '\0';
}
}
-static void gppi(HKEY key, LPCTSTR name, int def, int *i) {
- DWORD type, val, size;
- size = sizeof(val);
-
- if (key == NULL ||
- RegQueryValueEx(key, name, 0, &type,
- (BYTE *)&val, &size) != ERROR_SUCCESS ||
- size != sizeof(val) || type != REG_DWORD)
- *i = def;
- else
- *i = val;
+static void gppi(void *handle, char *name, int def, int *i) {
+ *i = read_setting_i(handle, name, def);
}
static HINSTANCE hinst;
static void save_settings (char *section, int do_host) {
int i;
- HKEY subkey1, sesskey;
char *p;
+ void *sesskey;
- p = malloc(3*strlen(section)+1);
- mungestr(section, p);
-
- if (RegCreateKey(HKEY_CURRENT_USER, puttystr, &subkey1)!=ERROR_SUCCESS ||
- RegCreateKey(subkey1, p, &sesskey) != ERROR_SUCCESS) {
- sesskey = NULL;
- }
-
- free(p);
- RegCloseKey(subkey1);
+ sesskey = open_settings_w(section);
+ if (!sesskey)
+ return;
- wppi (sesskey, "Present", 1);
+ write_setting_i (sesskey, "Present", 1);
if (do_host) {
- wpps (sesskey, "HostName", cfg.host);
- wppi (sesskey, "PortNumber", cfg.port);
+ write_setting_s (sesskey, "HostName", cfg.host);
+ write_setting_i (sesskey, "PortNumber", cfg.port);
p = "raw";
for (i = 0; backends[i].name != NULL; i++)
if (backends[i].protocol == cfg.protocol) {
p = backends[i].name;
break;
}
- wpps (sesskey, "Protocol", p);
+ write_setting_s (sesskey, "Protocol", p);
}
- wppi (sesskey, "CloseOnExit", !!cfg.close_on_exit);
- wppi (sesskey, "WarnOnClose", !!cfg.warn_on_close);
- wpps (sesskey, "TerminalType", cfg.termtype);
- wpps (sesskey, "TerminalSpeed", cfg.termspeed);
+ write_setting_i (sesskey, "CloseOnExit", !!cfg.close_on_exit);
+ write_setting_i (sesskey, "WarnOnClose", !!cfg.warn_on_close);
+ write_setting_s (sesskey, "TerminalType", cfg.termtype);
+ write_setting_s (sesskey, "TerminalSpeed", cfg.termspeed);
{
char buf[2*sizeof(cfg.environmt)], *p, *q;
p = buf;
q++;
}
*p = '\0';
- wpps (sesskey, "Environment", buf);
+ write_setting_s (sesskey, "Environment", buf);
}
- wpps (sesskey, "UserName", cfg.username);
- wppi (sesskey, "NoPTY", cfg.nopty);
- wppi (sesskey, "AgentFwd", cfg.agentfwd);
- wpps (sesskey, "RemoteCmd", cfg.remote_cmd);
- wpps (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" :
+ write_setting_s (sesskey, "UserName", cfg.username);
+ write_setting_i (sesskey, "NoPTY", cfg.nopty);
+ write_setting_i (sesskey, "AgentFwd", cfg.agentfwd);
+ write_setting_s (sesskey, "RemoteCmd", cfg.remote_cmd);
+ write_setting_s (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" :
cfg.cipher == CIPHER_DES ? "des" : "3des");
- wppi (sesskey, "AuthTIS", cfg.try_tis_auth);
- wppi (sesskey, "SshProt", cfg.sshprot);
- wpps (sesskey, "PublicKeyFile", cfg.keyfile);
- wppi (sesskey, "RFCEnviron", cfg.rfc_environ);
- wppi (sesskey, "BackspaceIsDelete", cfg.bksp_is_delete);
- wppi (sesskey, "RXVTHomeEnd", cfg.rxvt_homeend);
- wppi (sesskey, "LinuxFunctionKeys", cfg.funky_type);
- wppi (sesskey, "ApplicationCursorKeys", cfg.app_cursor);
- wppi (sesskey, "ApplicationKeypad", cfg.app_keypad);
- wppi (sesskey, "NetHackKeypad", cfg.nethack_keypad);
- wppi (sesskey, "AltF4", cfg.alt_f4);
- wppi (sesskey, "AltSpace", cfg.alt_space);
- wppi (sesskey, "LdiscTerm", cfg.ldisc_term);
- wppi (sesskey, "BlinkCur", cfg.blink_cur);
- wppi (sesskey, "Beep", cfg.beep);
- wppi (sesskey, "ScrollbackLines", cfg.savelines);
- wppi (sesskey, "DECOriginMode", cfg.dec_om);
- wppi (sesskey, "AutoWrapMode", cfg.wrap_mode);
- wppi (sesskey, "LFImpliesCR", cfg.lfhascr);
- wppi (sesskey, "WinNameAlways", cfg.win_name_always);
- wppi (sesskey, "TermWidth", cfg.width);
- wppi (sesskey, "TermHeight", cfg.height);
- wpps (sesskey, "Font", cfg.font);
- wppi (sesskey, "FontIsBold", cfg.fontisbold);
- wppi (sesskey, "FontCharSet", cfg.fontcharset);
- wppi (sesskey, "FontHeight", cfg.fontheight);
- wppi (sesskey, "FontVTMode", cfg.vtmode);
- wppi (sesskey, "TryPalette", cfg.try_palette);
- wppi (sesskey, "BoldAsColour", cfg.bold_colour);
+ write_setting_i (sesskey, "AuthTIS", cfg.try_tis_auth);
+ write_setting_i (sesskey, "SshProt", cfg.sshprot);
+ write_setting_s (sesskey, "PublicKeyFile", cfg.keyfile);
+ write_setting_s (sesskey, "RemoteCommand", cfg.remote_cmd);
+ write_setting_i (sesskey, "RFCEnviron", cfg.rfc_environ);
+ write_setting_i (sesskey, "BackspaceIsDelete", cfg.bksp_is_delete);
+ write_setting_i (sesskey, "RXVTHomeEnd", cfg.rxvt_homeend);
+ write_setting_i (sesskey, "LinuxFunctionKeys", cfg.funky_type);
+ write_setting_i (sesskey, "ApplicationCursorKeys", cfg.app_cursor);
+ write_setting_i (sesskey, "ApplicationKeypad", cfg.app_keypad);
+ write_setting_i (sesskey, "NetHackKeypad", cfg.nethack_keypad);
+ write_setting_i (sesskey, "AltF4", cfg.alt_f4);
+ write_setting_i (sesskey, "AltSpace", cfg.alt_space);
+ write_setting_i (sesskey, "LdiscTerm", cfg.ldisc_term);
+ write_setting_i (sesskey, "BlinkCur", cfg.blink_cur);
+ write_setting_i (sesskey, "Beep", cfg.beep);
+ write_setting_i (sesskey, "ScrollbackLines", cfg.savelines);
+ write_setting_i (sesskey, "DECOriginMode", cfg.dec_om);
+ write_setting_i (sesskey, "AutoWrapMode", cfg.wrap_mode);
+ write_setting_i (sesskey, "LFImpliesCR", cfg.lfhascr);
+ write_setting_i (sesskey, "WinNameAlways", cfg.win_name_always);
+ write_setting_s (sesskey, "WinTitle", cfg.wintitle);
+ write_setting_i (sesskey, "TermWidth", cfg.width);
+ write_setting_i (sesskey, "TermHeight", cfg.height);
+ write_setting_s (sesskey, "Font", cfg.font);
+ write_setting_i (sesskey, "FontIsBold", cfg.fontisbold);
+ write_setting_i (sesskey, "FontCharSet", cfg.fontcharset);
+ write_setting_i (sesskey, "FontHeight", cfg.fontheight);
+ write_setting_i (sesskey, "FontVTMode", cfg.vtmode);
+ write_setting_i (sesskey, "TryPalette", cfg.try_palette);
+ write_setting_i (sesskey, "BoldAsColour", cfg.bold_colour);
for (i=0; i<22; i++) {
char buf[20], buf2[30];
sprintf(buf, "Colour%d", i);
sprintf(buf2, "%d,%d,%d", cfg.colours[i][0],
cfg.colours[i][1], cfg.colours[i][2]);
- wpps (sesskey, buf, buf2);
+ write_setting_s (sesskey, buf, buf2);
}
- wppi (sesskey, "MouseIsXterm", cfg.mouse_is_xterm);
+ write_setting_i (sesskey, "MouseIsXterm", cfg.mouse_is_xterm);
for (i=0; i<256; i+=32) {
char buf[20], buf2[256];
int j;
sprintf(buf2+strlen(buf2), "%s%d",
(*buf2 ? "," : ""), cfg.wordness[j]);
}
- wpps (sesskey, buf, buf2);
+ write_setting_s (sesskey, buf, buf2);
}
- wppi (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin);
- wppi (sesskey, "88592Xlat", cfg.xlat_88592w1250);
- wppi (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr);
- wppi (sesskey, "ScrollBar", cfg.scrollbar);
- wppi (sesskey, "ScrollOnKey", cfg.scroll_on_key);
- wppi (sesskey, "LockSize", cfg.locksize);
- wppi (sesskey, "BCE", cfg.bce);
- wppi (sesskey, "BlinkText", cfg.blinktext);
-
- RegCloseKey(sesskey);
-}
-
-static void del_session (char *section) {
- HKEY subkey1;
- char *p;
-
- if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS)
- return;
-
- p = malloc(3*strlen(section)+1);
- mungestr(section, p);
- RegDeleteKey(subkey1, p);
- free(p);
-
- RegCloseKey(subkey1);
+ write_setting_i (sesskey, "KoiWinXlat", cfg.xlat_enablekoiwin);
+ write_setting_i (sesskey, "88592Xlat", cfg.xlat_88592w1250);
+ write_setting_i (sesskey, "CapsLockCyr", cfg.xlat_capslockcyr);
+ write_setting_i (sesskey, "ScrollBar", cfg.scrollbar);
+ write_setting_i (sesskey, "ScrollOnKey", cfg.scroll_on_key);
+ write_setting_i (sesskey, "LockSize", cfg.locksize);
+ write_setting_i (sesskey, "BCE", cfg.bce);
+ write_setting_i (sesskey, "BlinkText", cfg.blinktext);
+
+ close_settings_w(sesskey);
}
static void load_settings (char *section, int do_host) {
int i;
- HKEY subkey1, sesskey;
- char *p;
char prot[10];
+ void *sesskey;
- p = malloc(3*strlen(section)+1);
- mungestr(section, p);
-
- if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS) {
- sesskey = NULL;
- } else {
- if (RegOpenKey(subkey1, p, &sesskey) != ERROR_SUCCESS) {
- sesskey = NULL;
- }
- RegCloseKey(subkey1);
- }
-
- free(p);
+ sesskey = open_settings_r(section);
gpps (sesskey, "HostName", "", cfg.host, sizeof(cfg.host));
gppi (sesskey, "PortNumber", default_port, &cfg.port);
gppi (sesskey, "SshProt", 1, &cfg.sshprot);
gppi (sesskey, "AuthTIS", 0, &cfg.try_tis_auth);
gpps (sesskey, "PublicKeyFile", "", cfg.keyfile, sizeof(cfg.keyfile));
+ gpps (sesskey, "RemoteCommand", "", cfg.remote_cmd,
+ sizeof(cfg.remote_cmd));
gppi (sesskey, "RFCEnviron", 0, &cfg.rfc_environ);
gppi (sesskey, "BackspaceIsDelete", 1, &cfg.bksp_is_delete);
gppi (sesskey, "RXVTHomeEnd", 0, &cfg.rxvt_homeend);
gppi (sesskey, "AutoWrapMode", 1, &cfg.wrap_mode);
gppi (sesskey, "LFImpliesCR", 0, &cfg.lfhascr);
gppi (sesskey, "WinNameAlways", 0, &cfg.win_name_always);
+ gpps (sesskey, "WinTitle", "", cfg.wintitle, sizeof(cfg.wintitle));
gppi (sesskey, "TermWidth", 80, &cfg.width);
gppi (sesskey, "TermHeight", 24, &cfg.height);
gpps (sesskey, "Font", "Courier", cfg.font, sizeof(cfg.font));
gppi (sesskey, "BCE", 0, &cfg.bce);
gppi (sesskey, "BlinkText", 0, &cfg.blinktext);
- RegCloseKey(sesskey);
+ close_settings_r(sesskey);
}
static void force_normal(HWND hwnd)
logbox = NULL;
DestroyWindow (hwnd);
return 0;
+ case IDN_COPY:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED) {
+ int selcount;
+ int *selitems;
+ selcount = SendDlgItemMessage(hwnd, IDN_LIST,
+ LB_GETSELCOUNT, 0, 0);
+ selitems = malloc(selcount * sizeof(int));
+ if (selitems) {
+ int count = SendDlgItemMessage(hwnd, IDN_LIST,
+ LB_GETSELITEMS,
+ selcount, (LPARAM)selitems);
+ int i;
+ int size;
+ char *clipdata;
+ static unsigned char sel_nl[] = SEL_NL;
+
+ size = 0;
+ for (i = 0; i < count; i++)
+ size += strlen(events[selitems[i]]) + sizeof(sel_nl);
+
+ clipdata = malloc(size);
+ if (clipdata) {
+ char *p = clipdata;
+ for (i = 0; i < count; i++) {
+ char *q = events[selitems[i]];
+ int qlen = strlen(q);
+ memcpy(p, q, qlen);
+ p += qlen;
+ memcpy(p, sel_nl, sizeof(sel_nl));
+ p += sizeof(sel_nl);
+ }
+ write_clip(clipdata, size);
+ term_deselect();
+ free(clipdata);
+ }
+ free(selitems);
+ }
+ }
+ return 0;
}
return 0;
case WM_CLOSE:
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
- abtbox = NULL;
- DestroyWindow (hwnd);
+ EndDialog(hwnd, 1);
return 0;
}
return 0;
case WM_CLOSE:
- abtbox = NULL;
- DestroyWindow (hwnd);
+ EndDialog(hwnd, 1);
return 0;
}
return 0;
MessageBeep(0);
break;
}
- del_session(sessions[n]);
+ del_settings(sessions[n]);
get_sesslist (FALSE);
get_sesslist (TRUE);
SendDlgItemMessage (hwnd, IDC0_SESSLIST, LB_RESETCONTENT,
switch (msg) {
case WM_INITDIALOG:
CheckDlgButton (hwnd, IDC2_WRAPMODE, cfg.wrap_mode);
- CheckDlgButton (hwnd, IDC2_WINNAME, cfg.win_name_always);
CheckDlgButton (hwnd, IDC2_DECOM, cfg.dec_om);
CheckDlgButton (hwnd, IDC2_LFHASCR, cfg.lfhascr);
SetDlgItemInt (hwnd, IDC2_ROWSEDIT, cfg.height, FALSE);
SetDlgItemInt (hwnd, IDC2_SAVEEDIT, cfg.savelines, FALSE);
fmtfont (fontstatic);
SetDlgItemText (hwnd, IDC2_FONTSTATIC, fontstatic);
- CheckDlgButton (hwnd, IDC1_BLINKCUR, cfg.blink_cur);
CheckDlgButton (hwnd, IDC1_BEEP, cfg.beep);
- CheckDlgButton (hwnd, IDC2_SCROLLBAR, cfg.scrollbar);
- CheckDlgButton (hwnd, IDC2_LOCKSIZE, cfg.locksize);
CheckDlgButton (hwnd, IDC2_BCE, cfg.bce);
CheckDlgButton (hwnd, IDC2_BLINKTEXT, cfg.blinktext);
break;
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.wrap_mode = IsDlgButtonChecked (hwnd, IDC2_WRAPMODE);
break;
- case IDC2_WINNAME:
- if (HIWORD(wParam) == BN_CLICKED ||
- HIWORD(wParam) == BN_DOUBLECLICKED)
- cfg.win_name_always = IsDlgButtonChecked (hwnd, IDC2_WINNAME);
- break;
case IDC2_DECOM:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
SetDlgItemText (hwnd, IDC2_FONTSTATIC, fontstatic);
}
break;
- case IDC1_BLINKCUR:
- if (HIWORD(wParam) == BN_CLICKED ||
- HIWORD(wParam) == BN_DOUBLECLICKED)
- cfg.blink_cur = IsDlgButtonChecked (hwnd, IDC1_BLINKCUR);
- break;
case IDC1_BEEP:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.beep = IsDlgButtonChecked (hwnd, IDC1_BEEP);
break;
- case IDC2_SCROLLBAR:
- if (HIWORD(wParam) == BN_CLICKED ||
- HIWORD(wParam) == BN_DOUBLECLICKED)
- cfg.scrollbar = IsDlgButtonChecked (hwnd, IDC2_SCROLLBAR);
- break;
- case IDC2_LOCKSIZE:
- if (HIWORD(wParam) == BN_CLICKED ||
- HIWORD(wParam) == BN_DOUBLECLICKED)
- cfg.locksize = IsDlgButtonChecked (hwnd, IDC2_LOCKSIZE);
- break;
case IDC2_BLINKTEXT:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
return GeneralPanelProc (hwnd, msg, wParam, lParam);
}
+static int CALLBACK WindowProc (HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam) {
+ switch (msg) {
+ case WM_INITDIALOG:
+ SetDlgItemText (hwnd, IDCW_WINEDIT, cfg.wintitle);
+ CheckDlgButton (hwnd, IDCW_WINNAME, cfg.win_name_always);
+ CheckDlgButton (hwnd, IDCW_BLINKCUR, cfg.blink_cur);
+ CheckDlgButton (hwnd, IDCW_SCROLLBAR, cfg.scrollbar);
+ CheckDlgButton (hwnd, IDCW_LOCKSIZE, cfg.locksize);
+ break;
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case IDCW_WINNAME:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.win_name_always = IsDlgButtonChecked (hwnd, IDCW_WINNAME);
+ break;
+ case IDCW_BLINKCUR:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.blink_cur = IsDlgButtonChecked (hwnd, IDCW_BLINKCUR);
+ break;
+ case IDCW_SCROLLBAR:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.scrollbar = IsDlgButtonChecked (hwnd, IDCW_SCROLLBAR);
+ break;
+ case IDCW_LOCKSIZE:
+ if (HIWORD(wParam) == BN_CLICKED ||
+ HIWORD(wParam) == BN_DOUBLECLICKED)
+ cfg.locksize = IsDlgButtonChecked (hwnd, IDCW_LOCKSIZE);
+ break;
+ case IDCW_WINEDIT:
+ if (HIWORD(wParam) == EN_CHANGE)
+ GetDlgItemText (hwnd, IDCW_WINEDIT, cfg.wintitle,
+ sizeof(cfg.wintitle)-1);
+ break;
+ }
+ break;
+ }
+ return GeneralPanelProc (hwnd, msg, wParam, lParam);
+}
+
static int CALLBACK TelnetProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam) {
int i;
cfg.sshprot == 1 ? IDC3_SSHPROT1 : IDC3_SSHPROT2);
CheckDlgButton (hwnd, IDC3_AUTHTIS, cfg.try_tis_auth);
SetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile);
+ SetDlgItemText (hwnd, IDC3_CMDEDIT, cfg.remote_cmd);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
GetDlgItemText (hwnd, IDC3_PKEDIT, cfg.keyfile,
sizeof(cfg.keyfile)-1);
break;
+ case IDC3_CMDEDIT:
+ if (HIWORD(wParam) == EN_CHANGE)
+ GetDlgItemText (hwnd, IDC3_CMDEDIT, cfg.remote_cmd,
+ sizeof(cfg.remote_cmd)-1);
+ break;
case IDC3_PKBUTTON:
/*
* FIXME: this crashes. Find out why.
}
static DLGPROC panelproc[NPANELS] = {
- ConnectionProc, KeyboardProc, TerminalProc,
+ ConnectionProc, KeyboardProc, TerminalProc, WindowProc,
TelnetProc, SshProc, SelectionProc, ColourProc, TranslationProc
};
static char *panelids[NPANELS] = {
MAKEINTRESOURCE(IDD_PANEL0),
MAKEINTRESOURCE(IDD_PANEL1),
MAKEINTRESOURCE(IDD_PANEL2),
+ MAKEINTRESOURCE(IDD_PANELW),
MAKEINTRESOURCE(IDD_PANEL3),
MAKEINTRESOURCE(IDD_PANEL35),
MAKEINTRESOURCE(IDD_PANEL4),
};
static char *names[NPANELS] = {
- "Connection", "Keyboard", "Terminal", "Telnet",
+ "Connection", "Keyboard", "Terminal", "Window", "Telnet",
"SSH", "Selection", "Colours", "Translation"
};
-static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7};
-static int reconfp[RECONF_NPANELS] = { 1, 2, 5, 6, 7};
+static int mainp[MAIN_NPANELS] = { 0, 1, 2, 3, 4, 5, 6, 7, 8};
+static int reconfp[RECONF_NPANELS] = { 1, 2, 3, 6, 7, 8};
static int GenericMainDlgProc (HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam,
}
void get_sesslist(int allocate) {
+ static char otherbuf[2048];
static char *buffer;
- int buflen, bufsize, i, ret;
- char otherbuf[2048];
- char *p;
- HKEY subkey1;
+ int buflen, bufsize, i;
+ char *p, *ret;
+ void *handle;
if (allocate) {
- if (RegCreateKey(HKEY_CURRENT_USER,
- puttystr, &subkey1) != ERROR_SUCCESS)
+
+ if ((handle = enum_settings_start()) == NULL)
return;
buflen = bufsize = 0;
buffer = NULL;
- i = 0;
do {
- ret = RegEnumKey(subkey1, i++, otherbuf, sizeof(otherbuf));
- if (ret == ERROR_SUCCESS) {
- bufsize = buflen + 2048;
- buffer = srealloc(buffer, bufsize);
- unmungestr(otherbuf, buffer+buflen);
+ ret = enum_settings_next(handle, otherbuf, sizeof(otherbuf));
+ if (ret) {
+ int len = strlen(otherbuf)+1;
+ if (bufsize < buflen+len) {
+ bufsize = buflen + len + 2048;
+ buffer = srealloc(buffer, bufsize);
+ }
+ strcpy(buffer+buflen, otherbuf);
buflen += strlen(buffer+buflen)+1;
}
- } while (ret == ERROR_SUCCESS);
+ } while (ret);
+ enum_settings_finish(handle);
buffer = srealloc(buffer, buflen+1);
buffer[buflen] = '\0';
SendDlgItemMessage (logbox, IDN_LIST, LB_ADDSTRING,
0, (LPARAM)string);
count = SendDlgItemMessage (logbox, IDN_LIST, LB_GETCOUNT, 0, 0);
- SendDlgItemMessage (logbox, IDN_LIST, LB_SETCURSEL, count-1, 0);
+ SendDlgItemMessage (logbox, IDN_LIST, LB_SETTOPINDEX, count-1, 0);
}
}
}
}
-void verify_ssh_host_key(char *host, char *keystr) {
- char *otherstr, *mungedhost;
- int len;
- HKEY rkey;
+void verify_ssh_host_key(char *host, int port, char *keytype,
+ char *keystr, char *fingerprint) {
+ int ret;
+
+ static const char absentmsg[] =
+ "The server's host key is not cached in the registry. You\n"
+ "have no guarantee that the server is the computer you\n"
+ "think it is.\n"
+ "The server's key fingerprint is:\n"
+ "%s\n"
+ "If you trust this host, hit Yes to add the key to\n"
+ "PuTTY's cache and carry on connecting.\n"
+ "If you do not trust this host, hit No to abandon the\n"
+ "connection.\n";
+
+ static const char wrongmsg[] =
+ "WARNING - POTENTIAL SECURITY BREACH!\n"
+ "\n"
+ "The server's host key does not match the one PuTTY has\n"
+ "cached in the registry. This means that either the\n"
+ "server administrator has changed the host key, or you\n"
+ "have actually connected to another computer pretending\n"
+ "to be the server.\n"
+ "The new key fingerprint is:\n"
+ "%s\n"
+ "If you were expecting this change and trust the new key,\n"
+ "hit Yes to update PuTTY's cache and continue connecting.\n"
+ "If you want to carry on connecting but without updating\n"
+ "the cache, hit No.\n"
+ "If you want to abandon the connection completely, hit\n"
+ "Cancel. Hitting Cancel is the ONLY guaranteed safe\n"
+ "choice.\n";
+
+ static const char mbtitle[] = "PuTTY Security Alert";
- len = 1 + strlen(keystr);
+
+ char message[160+ /* sensible fingerprint max size */
+ (sizeof(absentmsg) > sizeof(wrongmsg) ?
+ sizeof(absentmsg) : sizeof(wrongmsg))];
/*
- * Now read a saved key in from the registry and see what it
- * says.
+ * Verify the key against the registry.
*/
- otherstr = smalloc(len);
- mungedhost = smalloc(3*strlen(host)+1);
- if (!otherstr || !mungedhost)
- fatalbox("Out of memory");
-
- mungestr(host, mungedhost);
-
- if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
- &rkey) != ERROR_SUCCESS) {
- if (MessageBox(NULL, "PuTTY was unable to open the host key cache\n"
- "in the registry. There is thus no way to tell\n"
- "if the remote host is what you think it is.\n"
- "Connect anyway?", "PuTTY Problem",
- MB_ICONWARNING | MB_YESNO) == IDNO)
- exit(0);
- } else {
- DWORD readlen = len;
- DWORD type;
- int ret;
-
- ret = RegQueryValueEx(rkey, mungedhost, NULL,
- &type, otherstr, &readlen);
-
- if (ret == ERROR_MORE_DATA ||
- (ret == ERROR_SUCCESS && type == REG_SZ &&
- strcmp(otherstr, keystr))) {
- if (MessageBox(NULL,
- "This host's host key is different from the\n"
- "one cached in the registry! Someone may be\n"
- "impersonating this host for malicious reasons;\n"
- "alternatively, the host key may have changed\n"
- "due to sloppy system administration.\n"
- "Replace key in registry and connect?",
- "PuTTY: Security Warning",
- MB_ICONWARNING | MB_YESNO) == IDNO)
- exit(0);
- RegSetValueEx(rkey, mungedhost, 0, REG_SZ, keystr,
- strlen(keystr)+1);
- } else if (ret != ERROR_SUCCESS || type != REG_SZ) {
- if (MessageBox(NULL,
- "This host's host key is not cached in the\n"
- "registry. Do you want to add it to the cache\n"
- "and carry on connecting?",
- "PuTTY: New Host",
- MB_ICONWARNING | MB_YESNO) == IDNO)
- exit(0);
- RegSetValueEx(rkey, mungedhost, 0, REG_SZ, keystr,
- strlen(keystr)+1);
- }
-
- RegCloseKey(rkey);
+ ret = verify_host_key(host, port, keytype, keystr);
+
+ if (ret == 0) /* success - key matched OK */
+ return;
+ if (ret == 2) { /* key was different */
+ int mbret;
+ sprintf(message, wrongmsg, fingerprint);
+ mbret = MessageBox(NULL, message, mbtitle,
+ MB_ICONWARNING | MB_YESNOCANCEL);
+ if (mbret == IDYES)
+ store_host_key(host, port, keytype, keystr);
+ if (mbret == IDCANCEL)
+ exit(0);
+ }
+ if (ret == 1) { /* key was absent */
+ int mbret;
+ sprintf(message, absentmsg, fingerprint);
+ mbret = MessageBox(NULL, message, mbtitle,
+ MB_ICONWARNING | MB_YESNO);
+ if (mbret == IDNO)
+ exit(0);
+ store_host_key(host, port, keytype, keystr);
}
}
projects / u / mdw / putty / blobdiff