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

Pageant: Diagnose agent without protocol extensions.

Browse Source 
Gives more helpful messages if Unix pageant ends up being a client for,
say, OpenSSH's ssh-agent, or indeed an older version of Pageant.

(Also, tweak a couple of other messages that still assumed that
pageant-as-client always talks to Pageant-as-agent.)
This commit is contained in:
Jacob Nevins 2021-04-05 15:20:25 +01:00
parent 569fc2681c
commit 909ab05b96
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pageant.c
View File

@ -2053,8 +2053,15 @@ int pageant_add_keyfile(Filename *filename, const char *passphrase,
pageant_client_op_free(pco); pageant_client_op_free(pco);
if (reply != SSH_AGENT_SUCCESS) { if (reply != SSH_AGENT_SUCCESS) {
*retstr = dupstr("The already running Pageant " if (reply == SSH_AGENT_FAILURE) {
"refused to add the key."); /* The agent didn't understand the protocol extension
* at all. */
*retstr = dupstr("Agent doesn't support adding "
"encrypted keys");
} else {
*retstr = dupstr("The already running agent "
"refused to add the key.");
}
return PAGEANT_ACTION_FAILURE; return PAGEANT_ACTION_FAILURE;
} }
@ -2168,7 +2175,7 @@ int pageant_add_keyfile(Filename *filename, const char *passphrase,
sfree(rkey); sfree(rkey);
if (reply != SSH_AGENT_SUCCESS) { if (reply != SSH_AGENT_SUCCESS) {
*retstr = dupstr("The already running Pageant " *retstr = dupstr("The already running agent "
"refused to add the key."); "refused to add the key.");
return PAGEANT_ACTION_FAILURE; return PAGEANT_ACTION_FAILURE;
} }
@ -2186,7 +2193,7 @@ int pageant_add_keyfile(Filename *filename, const char *passphrase,
sfree(skey); sfree(skey);
if (reply != SSH_AGENT_SUCCESS) { if (reply != SSH_AGENT_SUCCESS) {
*retstr = dupstr("The already running Pageant " *retstr = dupstr("The already running agent "
"refused to add the key."); "refused to add the key.");
return PAGEANT_ACTION_FAILURE; return PAGEANT_ACTION_FAILURE;
} }
@ -2342,7 +2349,12 @@ int pageant_reencrypt_key(struct pageant_pubkey *key, char **retstr)
pageant_client_op_free(pco); pageant_client_op_free(pco);
if (reply != SSH_AGENT_SUCCESS) { if (reply != SSH_AGENT_SUCCESS) {
*retstr = dupstr("Agent failed to re-encrypt key"); if (reply == SSH_AGENT_FAILURE) {
/* The agent didn't understand the protocol extension at all. */
*retstr = dupstr("Agent doesn't support encrypted keys");
} else {
*retstr = dupstr("Agent failed to re-encrypt key");
}
return PAGEANT_ACTION_FAILURE; return PAGEANT_ACTION_FAILURE;
} else { } else {
*retstr = NULL; *retstr = NULL;
@ -2359,7 +2371,12 @@ int pageant_reencrypt_all_keys(char **retstr)
uint32_t failures = get_uint32(pco); uint32_t failures = get_uint32(pco);
pageant_client_op_free(pco); pageant_client_op_free(pco);
if (reply != SSH_AGENT_SUCCESS) { if (reply != SSH_AGENT_SUCCESS) {
*retstr = dupstr("Agent failed to re-encrypt any keys"); if (reply == SSH_AGENT_FAILURE) {
/* The agent didn't understand the protocol extension at all. */
*retstr = dupstr("Agent doesn't support encrypted keys");
} else {
*retstr = dupstr("Agent failed to re-encrypt any keys");
}
return PAGEANT_ACTION_FAILURE; return PAGEANT_ACTION_FAILURE;
} else if (failures == 1) { } else if (failures == 1) {
/* special case for English grammar */ /* special case for English grammar */