diff --git a/ssh/common.c b/ssh/common.c index 161bebbd..a1b4d77d 100644 --- a/ssh/common.c +++ b/ssh/common.c @@ -1037,6 +1037,12 @@ SeatPromptResult verify_ssh_host_key( text, SDT_PARA, "If you were expecting this change and trust the " "new key, %s to update %s's cache and carry on connecting.", 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( text, SDT_PARA, "If you want to carry on connecting but without " "updating the cache, %s.", pds->hk_connect_once_action); diff --git a/windows/putty-common.rc2 b/windows/putty-common.rc2 index c6d403a5..a43e3ac1 100644 --- a/windows/putty-common.rc2 +++ b/windows/putty-common.rc2 @@ -56,7 +56,7 @@ BEGIN EDITTEXT IDA_TEXT, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE END -/* No accelerators used */ +/* Accelerators used: achio */ IDD_HOSTKEY DIALOG DISCARDABLE 50, 50, 340, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PuTTY Security Alert" @@ -65,7 +65,7 @@ CLASS "PuTTYHostKeyDialog" BEGIN 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 "Connect &Once", IDC_HK_ONCE, 216, 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 END -/* Accelerators used: clw */ +/* Accelerators used: c */ IDD_HK_MOREINFO DIALOG DISCARDABLE 140, 40, 400, 300 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PuTTY: information about the server's host key"