nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Merge Pageant updates from 'pre-0.75'.

Browse Source
This commit is contained in:
Simon Tatham 2021-04-22 20:01:32 +01:00
commit 70da3463c0
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/pageant.but
View File

@ -247,7 +247,7 @@ available (not just the ones downstream of the place you added it).
\H{pageant-deferred-decryption} Loading keys without decrypting them \H{pageant-deferred-decryption} Loading keys without decrypting them
You can also add keys to Pageant \e{without} decrypting them. The key You can add keys to Pageant \e{without} decrypting them. The key
file will be held in Pageant's memory still encrypted, and when a file will be held in Pageant's memory still encrypted, and when a
client program first tries to use the key, Pageant will display a client program first tries to use the key, Pageant will display a
dialog box prompting for the passphrase so that the key can be dialog box prompting for the passphrase so that the key can be

3
windows/pageant-rc.h
View File

@ -14,7 +14,8 @@
#define IDC_PASSPHRASE_STATIC1 100 #define IDC_PASSPHRASE_STATIC1 100
#define IDC_PASSPHRASE_FINGERPRINT 101 #define IDC_PASSPHRASE_FINGERPRINT 101
#define IDC_PASSPHRASE_STATIC2 102 #define IDC_PASSPHRASE_STATIC2 102
#define IDC_PASSPHRASE_EDITBOX 103 #define IDC_PASSPHRASE_STATIC3 103
#define IDC_PASSPHRASE_EDITBOX 104
#define IDC_KEYLIST_LISTBOX 100 #define IDC_KEYLIST_LISTBOX 100
#define IDC_KEYLIST_ADDKEY 101 #define IDC_KEYLIST_ADDKEY 101

13
windows/pageant.rc
View File

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "&Cancel", IDCANCEL, 80, 42, 40, 14 PUSHBUTTON "&Cancel", IDCANCEL, 80, 42, 40, 14
END END
IDD_ONDEMAND_PASSPHRASE DIALOG DISCARDABLE 0, 0, 250, 70 IDD_ONDEMAND_PASSPHRASE DIALOG DISCARDABLE 0, 0, 250, 78
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Pageant: Decrypting Stored Key" CAPTION "Pageant: Decrypting Stored Key"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -35,12 +35,15 @@ BEGIN
CTEXT "A client of Pageant wants to use the following encrypted key:", CTEXT "A client of Pageant wants to use the following encrypted key:",
IDC_PASSPHRASE_STATIC1, 10, 6, 230, 8 IDC_PASSPHRASE_STATIC1, 10, 6, 230, 8
CTEXT "", IDC_PASSPHRASE_FINGERPRINT, 10, 16, 230, 8 CTEXT "", IDC_PASSPHRASE_FINGERPRINT, 10, 16, 230, 8
CTEXT "If you intended this, enter the passphrase to decrypt the key.", CTEXT "If you intended this, click in this box to make sure it has",
IDC_PASSPHRASE_STATIC2, 10, 26, 230, 8 IDC_PASSPHRASE_STATIC2, 10, 26, 230, 8
EDITTEXT IDC_PASSPHRASE_EDITBOX, 10, 36, 230, 12, CTEXT "input focus, then enter the passphrase to decrypt the key.",
IDC_PASSPHRASE_STATIC3, 10, 34, 230, 8
EDITTEXT IDC_PASSPHRASE_EDITBOX, 10, 44, 230, 12,
ES_PASSWORD | ES_AUTOHSCROLL ES_PASSWORD | ES_AUTOHSCROLL
DEFPUSHBUTTON "O&K", IDOK, 75, 52, 40, 14 DEFPUSHBUTTON "O&K", IDOK, 45, 60, 40, 14
PUSHBUTTON "&Cancel", IDCANCEL, 135, 52, 40, 14 PUSHBUTTON "&Cancel", IDCANCEL, 105, 60, 40, 14
PUSHBUTTON "&Help", IDHELP, 165, 60, 50, 14
END END
IDD_KEYLIST DIALOG DISCARDABLE 0, 0, 450, 236 IDD_KEYLIST DIALOG DISCARDABLE 0, 0, 450, 236

7
windows/winpgnt.c
View File

@ -97,6 +97,7 @@ static bool has_security;
struct PassphraseProcStruct { struct PassphraseProcStruct {
bool modal; bool modal;
const char *help_topic;
PageantClientDialogId *dlgid; PageantClientDialogId *dlgid;
char *passphrase; char *passphrase;
const char *comment; const char *comment;
@ -269,6 +270,10 @@ static INT_PTR CALLBACK PassphraseProc(HWND hwnd, UINT msg,
case IDCANCEL: case IDCANCEL:
end_passphrase_dialog(hwnd, 0); end_passphrase_dialog(hwnd, 0);
return 0; return 0;
case IDHELP:
if (p->help_topic)
launch_help(hwnd, p->help_topic);
return 0;
case IDC_PASSPHRASE_EDITBOX: case IDC_PASSPHRASE_EDITBOX:
if ((HIWORD(wParam) == EN_CHANGE) && p->passphrase) { if ((HIWORD(wParam) == EN_CHANGE) && p->passphrase) {
burnstr(p->passphrase); burnstr(p->passphrase);
@ -451,6 +456,7 @@ static void win_add_keyfile(Filename *filename, bool encrypted)
INT_PTR dlgret; INT_PTR dlgret;
struct PassphraseProcStruct pps; struct PassphraseProcStruct pps;
pps.modal = true; pps.modal = true;
pps.help_topic = NULL; /* this dialog has no help button */
pps.dlgid = NULL; pps.dlgid = NULL;
pps.passphrase = NULL; pps.passphrase = NULL;
pps.comment = err; pps.comment = err;
@ -898,6 +904,7 @@ static bool ask_passphrase_common(PageantClientDialogId *dlgid,
struct PassphraseProcStruct *pps = snew(struct PassphraseProcStruct); struct PassphraseProcStruct *pps = snew(struct PassphraseProcStruct);
pps->modal = false; pps->modal = false;
pps->help_topic = WINHELP_CTX_pageant_deferred;
pps->dlgid = dlgid; pps->dlgid = dlgid;
pps->passphrase = NULL; pps->passphrase = NULL;
pps->comment = comment; pps->comment = comment;