diff options
| author | Werner Koch <[email protected]> | 2016-01-08 05:33:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-01-08 05:33:27 +0000 |
| commit | 833ba5faa1340aff80a205acbb701d4ae1d594d0 (patch) | |
| tree | aca806cf5e2c3a262f3d295f313243c7f1c10f0d /agent/call-scd.c | |
| parent | gpg: Return an error code from keygrip_from_pk. (diff) | |
| download | gnupg-833ba5faa1340aff80a205acbb701d4ae1d594d0.tar.gz gnupg-833ba5faa1340aff80a205acbb701d4ae1d594d0.zip | |
common: New put_membuf_cb to replace static membuf_data_cb.
* common/membuf.c (put_membuf_cb): New.
* agent/call-scd.c (membuf_data_cb): Remove. Change callers to use
put_membuf_cb.
* common/get-passphrase.c (membuf_data_cb): Ditto.
* g10/call-agent.c (membuf_data_cb): Ditto.
* sm/call-agent.c (membuf_data_cb): Ditto.
--
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/call-scd.c')
| -rw-r--r-- | agent/call-scd.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/agent/call-scd.c b/agent/call-scd.c index 9c4d7b130..b77684007 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -113,8 +113,6 @@ static int primary_scd_ctx_reusable; /* Local prototypes. */ -static gpg_error_t membuf_data_cb (void *opaque, - const void *buffer, size_t length); @@ -354,7 +352,7 @@ start_scd (ctrl_t ctrl) socket_name = NULL; init_membuf (&data, 256); assuan_transact (ctx, "GETINFO socket_name", - membuf_data_cb, &data, NULL, NULL, NULL, NULL); + put_membuf_cb, &data, NULL, NULL, NULL, NULL); databuf = get_membuf (&data, &datalen); if (databuf && datalen) @@ -688,16 +686,6 @@ agent_card_serialno (ctrl_t ctrl, char **r_serialno) -static gpg_error_t -membuf_data_cb (void *opaque, const void *buffer, size_t length) -{ - membuf_t *data = opaque; - - if (buffer) - put_membuf (data, buffer, length); - return 0; -} - /* Handle the NEEDPIN inquiry. */ static gpg_error_t inq_needpin (void *opaque, const char *line) @@ -855,7 +843,7 @@ agent_card_pksign (ctrl_t ctrl, snprintf (line, sizeof line, "PKSIGN %s %s", hash_algo_option (mdalgo), keyid); rc = assuan_transact (ctrl->scd_local->ctx, line, - membuf_data_cb, &data, + put_membuf_cb, &data, inq_needpin, &inqparm, NULL, NULL); if (inqparm.any_inq_seen && (gpg_err_code(rc) == GPG_ERR_CANCELED || @@ -944,7 +932,7 @@ agent_card_pkdecrypt (ctrl_t ctrl, snprintf (line, DIM(line)-1, "PKDECRYPT %s", keyid); line[DIM(line)-1] = 0; rc = assuan_transact (ctrl->scd_local->ctx, line, - membuf_data_cb, &data, + put_membuf_cb, &data, inq_needpin, &inqparm, padding_info_cb, r_padding); if (inqparm.any_inq_seen && (gpg_err_code(rc) == GPG_ERR_CANCELED || @@ -984,7 +972,7 @@ agent_card_readcert (ctrl_t ctrl, snprintf (line, DIM(line)-1, "READCERT %s", id); line[DIM(line)-1] = 0; rc = assuan_transact (ctrl->scd_local->ctx, line, - membuf_data_cb, &data, + put_membuf_cb, &data, NULL, NULL, NULL, NULL); if (rc) @@ -1020,7 +1008,7 @@ agent_card_readkey (ctrl_t ctrl, const char *id, unsigned char **r_buf) snprintf (line, DIM(line)-1, "READKEY %s", id); line[DIM(line)-1] = 0; rc = assuan_transact (ctrl->scd_local->ctx, line, - membuf_data_cb, &data, + put_membuf_cb, &data, NULL, NULL, NULL, NULL); if (rc) |