nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge host-key warning tweaks from 'pre-0.78'.

Browse Source
This commit is contained in:
Jacob Nevins 2022-10-21 20:42:04 +01:00
commit 75285933ae
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh/common.c
View File

@ -1037,6 +1037,12 @@ SeatPromptResult verify_ssh_host_key(
text, SDT_PARA, "If you were expecting this change and trust the " text, SDT_PARA, "If you were expecting this change and trust the "
"new key, %s to update %s's cache and carry on connecting.", "new key, %s to update %s's cache and carry on connecting.",
pds->hk_accept_action, appname); pds->hk_accept_action, appname);
if (key && ssh_key_alg(key)->is_certificate) {
seat_dialog_text_append(
text, SDT_PARA, "(Storing this certified key in the cache "
"will NOT cause its certification authority to be trusted "
"for any other key or host.)");
}
seat_dialog_text_append( seat_dialog_text_append(
text, SDT_PARA, "If you want to carry on connecting but without " text, SDT_PARA, "If you want to carry on connecting but without "
"updating the cache, %s.", pds->hk_connect_once_action); "updating the cache, %s.", pds->hk_connect_once_action);

6
windows/putty-common.rc2
View File

@ -56,7 +56,7 @@ BEGIN
EDITTEXT IDA_TEXT, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE EDITTEXT IDA_TEXT, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
END END
/* No accelerators used */ /* Accelerators used: achio */
IDD_HOSTKEY DIALOG DISCARDABLE 50, 50, 340, 240 IDD_HOSTKEY DIALOG DISCARDABLE 50, 50, 340, 240
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "PuTTY Security Alert" CAPTION "PuTTY Security Alert"
@ -65,7 +65,7 @@ CLASS "PuTTYHostKeyDialog"
BEGIN BEGIN
ICON "", IDC_HK_ICON, 10, 18, 0, 0 ICON "", IDC_HK_ICON, 10, 18, 0, 0
PUSHBUTTON "Cancel", IDCANCEL, 288, 220, 40, 14 PUSHBUTTON "&Cancel", IDCANCEL, 288, 220, 40, 14
PUSHBUTTON "&Accept", IDC_HK_ACCEPT, 168, 220, 40, 14 PUSHBUTTON "&Accept", IDC_HK_ACCEPT, 168, 220, 40, 14
PUSHBUTTON "Connect &Once", IDC_HK_ONCE, 216, 220, 64, 14 PUSHBUTTON "Connect &Once", IDC_HK_ONCE, 216, 220, 64, 14
PUSHBUTTON "More &info...", IDC_HK_MOREINFO, 60, 220, 64, 14 PUSHBUTTON "More &info...", IDC_HK_MOREINFO, 60, 220, 64, 14
@ -76,7 +76,7 @@ BEGIN
EDITTEXT IDC_HK_TEXT, 40, 20, 290, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE EDITTEXT IDC_HK_TEXT, 40, 20, 290, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
END END
/* Accelerators used: clw */ /* Accelerators used: c */
IDD_HK_MOREINFO DIALOG DISCARDABLE 140, 40, 400, 300 IDD_HK_MOREINFO DIALOG DISCARDABLE 140, 40, 400, 300
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "PuTTY: information about the server's host key" CAPTION "PuTTY: information about the server's host key"