diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 5 | ||||
| -rw-r--r-- | sm/call-agent.c | 24 | ||||
| -rw-r--r-- | sm/call-dirmngr.c | 3 | ||||
| -rw-r--r-- | sm/server.c | 2 |
4 files changed, 20 insertions, 14 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 8388b3921..4bddd2487 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,8 @@ +2002-02-27 Werner Koch <[email protected]> + + * call-dirmngr.c, call-agent.c: Add 2 more arguments to all uses + of assuan_transact. + 2002-02-25 Werner Koch <[email protected]> * server.c (option_handler): Allow to use -2 for "send all certs diff --git a/sm/call-agent.c b/sm/call-agent.c index 54e8facb1..14e2fdf34 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -245,13 +245,13 @@ gpgsm_agent_pksign (const char *keygrip, if (digestlen*2 + 50 > DIM(line)) return seterr (General_Error); - rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return map_assuan_err (rc); snprintf (line, DIM(line)-1, "SIGKEY %s", keygrip); line[DIM(line)-1] = 0; - rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return map_assuan_err (rc); @@ -259,13 +259,13 @@ gpgsm_agent_pksign (const char *keygrip, p = line + strlen (line); for (i=0; i < digestlen ; i++, p += 2 ) sprintf (p, "%02X", digest[i]); - rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return map_assuan_err (rc); init_membuf (&data, 1024); rc = assuan_transact (agent_ctx, "PKSIGN", - membuf_data_cb, &data, NULL, NULL); + membuf_data_cb, &data, NULL, NULL, NULL, NULL); if (rc) { xfree (get_membuf (&data, &len)); @@ -327,14 +327,14 @@ gpgsm_agent_pkdecrypt (const char *keygrip, if (rc) return rc; - rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return map_assuan_err (rc); assert ( DIM(line) >= 50 ); snprintf (line, DIM(line)-1, "SETKEY %s", keygrip); line[DIM(line)-1] = 0; - rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return map_assuan_err (rc); @@ -344,7 +344,7 @@ gpgsm_agent_pkdecrypt (const char *keygrip, cipher_parm.ciphertextlen = ciphertextlen; rc = assuan_transact (agent_ctx, "PKDECRYPT", membuf_data_cb, &data, - inq_ciphertext_cb, &cipher_parm); + inq_ciphertext_cb, &cipher_parm, NULL, NULL); if (rc) { xfree (get_membuf (&data, &len)); @@ -403,7 +403,7 @@ gpgsm_agent_genkey (KsbaConstSexp keyparms, KsbaSexp *r_pubkey) if (rc) return rc; - rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return map_assuan_err (rc); @@ -415,7 +415,7 @@ gpgsm_agent_genkey (KsbaConstSexp keyparms, KsbaSexp *r_pubkey) return GNUPG_Invalid_Value; rc = assuan_transact (agent_ctx, "GENKEY", membuf_data_cb, &data, - inq_genkey_parms, &gk_parm); + inq_genkey_parms, &gk_parm, NULL, NULL); if (rc) { xfree (get_membuf (&data, &len)); @@ -458,7 +458,7 @@ gpgsm_agent_istrusted (KsbaCert cert) line[DIM(line)-1] = 0; xfree (fpr); - rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); return map_assuan_err (rc); } @@ -492,7 +492,7 @@ gpgsm_agent_marktrusted (KsbaCert cert) ksba_free (dn); xfree (fpr); - rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); return map_assuan_err (rc); } @@ -516,7 +516,7 @@ gpgsm_agent_havekey (const char *hexkeygrip) snprintf (line, DIM(line)-1, "HAVEKEY %s", hexkeygrip); line[DIM(line)-1] = 0; - rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL); + rc = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL); return map_assuan_err (rc); } diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index ee41eb4ff..172a4d027 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -227,7 +227,8 @@ gpgsm_dirmngr_isvalid (KsbaCert cert) line[DIM(line)-1] = 0; xfree (certid); - rc = assuan_transact (dirmngr_ctx, line, NULL, NULL, inq_certificate, &parm); + rc = assuan_transact (dirmngr_ctx, line, NULL, NULL, + inq_certificate, &parm, NULL, NULL); return map_assuan_err (rc); } diff --git a/sm/server.c b/sm/server.c index ebcb7f9ad..065fc5acc 100644 --- a/sm/server.c +++ b/sm/server.c @@ -371,7 +371,7 @@ cmd_message (ASSUAN_CONTEXT ctx, char *line) /* Note that the line contains a space separated list of pappern where - each pappern is percent escaped and spacesmay be replaced by + each pappern is percent escaped and spaces may be replaced by '+'. */ static int cmd_listkeys (ASSUAN_CONTEXT ctx, char *line) |