summaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/ChangeLog17
-rw-r--r--agent/call-pinentry.c6
-rw-r--r--agent/call-scd.c2
-rw-r--r--agent/command-ssh.c15
-rw-r--r--agent/command.c18
-rw-r--r--agent/findkey.c2
-rw-r--r--agent/genkey.c2
-rw-r--r--agent/protect-tool.c2
-rw-r--r--agent/t-protect.c3
9 files changed, 66 insertions, 1 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index f3f5131d3..1a063aae8 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,20 @@
+2008-10-20 Werner Koch <wk@g10code.com>
+
+ * command.c (cmd_geteventcounter): Mark unused arg.
+ (cmd_listtrusted, cmd_pksign, cmd_pkdecrypt, cmd_genkey): Ditto.
+ (cmd_updatestartuptty, post_cmd_notify): Ditto.
+ * command-ssh.c (add_control_entry)
+ (ssh_handler_request_identities, ssh_handler_remove_identity)
+ (ssh_handler_remove_all_identities, ssh_handler_lock)
+ (ssh_handler_unlock): Ditto.
+ * call-pinentry.c (pinentry_active_p, popup_message_thread)
+ (agent_popup_message_stop): Ditto.
+ * findkey.c (agent_public_key_from_file): Ditto.
+ * genkey.c (check_passphrase_pattern): Ditto.
+ * call-scd.c (atfork_cb): Ditto.
+ * protect-tool.c (import_p12_cert_cb): Ditto.
+ * t-protect.c (main): Ditto.
+
2008-10-17 Werner Koch <wk@g10code.com>
* call-scd.c (start_scd) [W32]: Use snprintf again because we now
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index ea18d43dd..86792d8d7 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -410,6 +410,8 @@ start_pinentry (ctrl_t ctrl)
int
pinentry_active_p (ctrl_t ctrl, int waitseconds)
{
+ (void)ctrl;
+
if (waitseconds > 0)
{
pth_event_t evt;
@@ -935,6 +937,8 @@ agent_show_message (ctrl_t ctrl, const char *desc, const char *ok_btn)
static void *
popup_message_thread (void *arg)
{
+ (void)arg;
+
/* We use the --one-button hack instead of the MESSAGE command to
allow the use of old Pinentries. Those old Pinentries will then
show an additional Cancel button but that is mostly a visual
@@ -1008,6 +1012,8 @@ agent_popup_message_stop (ctrl_t ctrl)
int rc;
pid_t pid;
+ (void)ctrl;
+
if (!popup_tid || !entry_ctx)
{
log_debug ("agent_popup_message_stop called with no active popup\n");
diff --git a/agent/call-scd.c b/agent/call-scd.c
index fce132004..48998da70 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -191,6 +191,8 @@ unlock_scd (ctrl_t ctrl, int rc)
static void
atfork_cb (void *opaque, int where)
{
+ (void)opaque;
+
if (!where)
gcry_control (GCRYCTL_TERM_SECMEM);
}
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 527b9e2aa..c262cade7 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -782,6 +782,8 @@ add_control_entry (ctrl_t ctrl, const char *hexgrip, int ttl)
FILE *fp;
int disabled;
+ (void)ctrl;
+
err = open_control_file (&fp, 1);
if (err)
return err;
@@ -1782,6 +1784,8 @@ ssh_handler_request_identities (ctrl_t ctrl,
char *cardsn;
gpg_error_t ret_err;
+ (void)request;
+
/* Prepare buffer stream. */
key_directory = NULL;
@@ -2541,6 +2545,8 @@ ssh_handler_remove_identity (ctrl_t ctrl,
gpg_error_t ret_err;
gpg_error_t err;
+ (void)ctrl;
+
/* Receive key. */
key_blob = NULL;
@@ -2590,6 +2596,9 @@ ssh_handler_remove_all_identities (ctrl_t ctrl,
{
gpg_error_t ret_err;
gpg_error_t err;
+
+ (void)ctrl;
+ (void)request;
err = ssh_identities_remove_all ();
@@ -2632,6 +2641,9 @@ ssh_handler_lock (ctrl_t ctrl, estream_t request, estream_t response)
{
gpg_error_t ret_err;
gpg_error_t err;
+
+ (void)ctrl;
+ (void)request;
err = ssh_lock ();
@@ -2650,6 +2662,9 @@ ssh_handler_unlock (ctrl_t ctrl, estream_t request, estream_t response)
gpg_error_t ret_err;
gpg_error_t err;
+ (void)ctrl;
+ (void)request;
+
err = ssh_unlock ();
if (! err)
diff --git a/agent/command.c b/agent/command.c
index 066494101..f5787621c 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -357,6 +357,8 @@ cmd_geteventcounter (assuan_context_t ctx, char *line)
char key_counter[25];
char card_counter[25];
+ (void)line;
+
snprintf (any_counter, sizeof any_counter, "%u", eventcounter.any);
snprintf (key_counter, sizeof key_counter, "%u", eventcounter.key);
snprintf (card_counter, sizeof card_counter, "%u", eventcounter.card);
@@ -436,7 +438,11 @@ cmd_istrusted (assuan_context_t ctx, char *line)
static int
cmd_listtrusted (assuan_context_t ctx, char *line)
{
- int rc = agent_listtrusted (ctx);
+ int rc;
+
+ (void)line;
+
+ rc = agent_listtrusted (ctx);
if (rc)
log_error ("command listtrusted failed: %s\n", gpg_strerror (rc));
return rc;
@@ -652,6 +658,8 @@ cmd_pksign (assuan_context_t ctx, char *line)
ctrl_t ctrl = assuan_get_pointer (ctx);
membuf_t outbuf;
+ (void)line;
+
if (opt.ignore_cache_for_signing)
cache_mode = CACHE_MODE_IGNORE;
else if (!ctrl->server_local->use_cache_for_signing)
@@ -685,6 +693,8 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
size_t valuelen;
membuf_t outbuf;
+ (void)line;
+
/* First inquire the data to decrypt */
rc = assuan_inquire (ctx, "CIPHERTEXT",
&value, &valuelen, MAXLEN_CIPHERTEXT);
@@ -731,6 +741,8 @@ cmd_genkey (assuan_context_t ctx, char *line)
size_t valuelen;
membuf_t outbuf;
+ (void)line;
+
/* First inquire the parameters */
rc = assuan_inquire (ctx, "KEYPARAM", &value, &valuelen, MAXLEN_KEYPARAM);
if (rc)
@@ -1312,6 +1324,8 @@ cmd_updatestartuptty (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+ (void)line;
+
xfree (opt.startup_display); opt.startup_display = NULL;
xfree (opt.startup_ttyname); opt.startup_ttyname = NULL;
xfree (opt.startup_ttytype); opt.startup_ttytype = NULL;
@@ -1505,6 +1519,8 @@ static void
post_cmd_notify (assuan_context_t ctx, int err)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+
+ (void)err;
/* Switch off any I/O monitor controlled logging pausing. */
ctrl->server_local->pause_io_logging = 0;
diff --git a/agent/findkey.c b/agent/findkey.c
index 183af2c5e..ddcd26267 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -669,6 +669,8 @@ agent_public_key_from_file (ctrl_t ctrl,
const char *elems;
gcry_mpi_t *array;
+ (void)ctrl;
+
*result = NULL;
rc = read_key_file (grip, &s_skey);
diff --git a/agent/genkey.c b/agent/genkey.c
index efebbfa7e..cbddb85d3 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -99,6 +99,8 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
pid_t pid;
int result, i;
+ (void)ctrl;
+
infp = gnupg_tmpfile ();
if (!infp)
{
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index 910ba036d..288dbe83b 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -630,6 +630,8 @@ import_p12_cert_cb (void *opaque, const unsigned char *cert, size_t certlen)
struct b64state state;
gpg_error_t err, err2;
+ (void)opaque;
+
err = b64enc_start (&state, stdout, "CERTIFICATE");
if (!err)
err = b64enc_write (&state, cert, certlen);
diff --git a/agent/t-protect.c b/agent/t-protect.c
index aadbe6adc..0e29cafe2 100644
--- a/agent/t-protect.c
+++ b/agent/t-protect.c
@@ -294,6 +294,9 @@ test_agent_get_shadow_info (void)
int
main (int argc, char **argv)
{
+ (void)argc;
+ (void)argv;
+
gcry_control (GCRYCTL_DISABLE_SECMEM);
test_agent_protect ();