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

Assorted bug fixes for runtime passphrase prompts.

Browse Source 
Now I'm able to use the new feature in a less horrible UI, I'm
exploring all the code paths that weren't tested before.
This commit is contained in:
Simon Tatham 2020-02-08 19:14:14 +00:00
parent d72c8d11c1
commit 86ebc37783
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pageant.c
View File

@ -479,6 +479,8 @@ void pageant_passphrase_request_success(PageantClientDialogId *dlgid,
fail_requests_for_key(pk, "unable to decrypt key"); fail_requests_for_key(pk, "unable to decrypt key");
return; return;
} else if (pk->skey == SSH2_WRONG_PASSPHRASE) { } else if (pk->skey == SSH2_WRONG_PASSPHRASE) {
pk->skey = NULL;
/* /*
* Find a PageantClient to use for another attempt at * Find a PageantClient to use for another attempt at
* request_passphrase. * request_passphrase.
@ -496,11 +498,12 @@ void pageant_passphrase_request_success(PageantClientDialogId *dlgid,
PageantSignOp *so = container_of(pk->blocked_requests.next, PageantSignOp *so = container_of(pk->blocked_requests.next,
PageantSignOp, pkr); PageantSignOp, pkr);
pk->decryption_prompt_active = false;
if (!request_passphrase(so->pao.info->pc, pk)) { if (!request_passphrase(so->pao.info->pc, pk)) {
fail_requests_for_key(pk, "unable to continue creating " fail_requests_for_key(pk, "unable to continue creating "
"passphrase prompts"); "passphrase prompts");
return;
} }
return;
} }
} }
@ -514,7 +517,7 @@ void pageant_passphrase_request_refused(PageantClientDialogId *dlgid)
assert(gui_request_in_progress); assert(gui_request_in_progress);
gui_request_in_progress = false; gui_request_in_progress = false;
unblock_requests_for_key(pk); fail_requests_for_key(pk, "user refused to supply passphrase");
} }
typedef struct PageantImmOp PageantImmOp; typedef struct PageantImmOp PageantImmOp;