nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

Pageant: introduce an API for passphrase prompts.

Browse Source 
This begins to head towards the goal of storing a key file encrypted
in Pageant, and decrypting it on demand via a GUI prompt the first
time a client requests a signature from it. That won't be a facility
available in all situations, so we have to be able to return failure
from the prompt.

More precisely, there are two versions of this API, one in
PageantClient and one in PageantListenerClient: the stream
implementation of PageantClient implements the former API and hands it
off to the latter. Windows Pageant has to directly implement both (but
they will end up funnelling to the same function within winpgnt.c).

NFC: for the moment, the new API functions are never called, and every
implementation of them returns failure.
This commit is contained in:
Simon Tatham
2020-01-20 21:22:33 +00:00
parent be30aac153
commit 08d5c233b3
4 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pageant.h
View File

@ -15,6 +15,7 @@ typedef struct PageantClientVtable PageantClientVtable;
typedef struct PageantClient PageantClient;
typedef struct PageantClientInfo PageantClientInfo;
typedef struct PageantClientRequestId PageantClientRequestId;
typedef struct PageantClientDialogId PageantClientDialogId;
struct PageantClient {
const struct PageantClientVtable *vt;
PageantClientInfo *info; /* used by the central Pageant code */
@ -32,6 +33,8 @@ struct PageantClientVtable {
const char *fmt, va_list ap);
void (*got_response)(PageantClient *pc, PageantClientRequestId *reqid,
ptrlen response);
bool (*ask_passphrase)(PageantClient *pc, PageantClientDialogId *dlgid,
const char *msg);
};
static inline void pageant_client_log_v(
@ -54,6 +57,9 @@ static inline PRINTF_LIKE(3, 4) void pageant_client_log(
static inline void pageant_client_got_response(
PageantClient *pc, PageantClientRequestId *reqid, ptrlen response)
{ pc->vt->got_response(pc, reqid, response); }
static inline bool pageant_client_ask_passphrase(
PageantClient *pc, PageantClientDialogId *dlgid, const char *msg)
{ return pc->vt->ask_passphrase(pc, dlgid, msg); }
/* PageantClientRequestId is used to match up responses to the agent
* requests they refer to. A client may allocate one of these for each
@ -91,6 +97,13 @@ void pageant_unregister_client(PageantClient *pc);
void pageant_handle_msg(PageantClient *pc, PageantClientRequestId *reqid,
ptrlen msg);
/*
* Send the core Pageant code a response to a passphrase request.
*/
void pageant_passphrase_request_success(PageantClientDialogId *dlgid,
ptrlen passphrase);
void pageant_passphrase_request_refused(PageantClientDialogId *dlgid);
/*
* Construct a list of public keys, just as the two LIST_IDENTITIES
* requests would have returned them.
@ -145,6 +158,8 @@ struct PageantListenerClient {
};
struct PageantListenerClientVtable {
void (*log)(PageantListenerClient *, const char *fmt, va_list ap);
bool (*ask_passphrase)(PageantListenerClient *pc,
PageantClientDialogId *dlgid, const char *msg);
};
static inline void pageant_listener_client_log_v(
@ -163,6 +178,9 @@ static inline PRINTF_LIKE(2, 3) void pageant_listener_client_log(
va_end(ap);
}
}
static inline bool pageant_listener_client_ask_passphrase(
PageantListenerClient *plc, PageantClientDialogId *dlgid, const char *msg)
{ return plc->vt->ask_passphrase(plc, dlgid, msg); }
struct pageant_listen_state;
struct pageant_listen_state *pageant_listener_new(