[svn] GnuPG - r5188 - in trunk: agent common g10 g13 scd sm
svn author marcus
cvs at cvs.gnupg.org
Mon Nov 2 18:47:12 CET 2009
Author: marcus
Date: 2009-11-02 18:47:11 +0100 (Mon, 02 Nov 2009)
New Revision: 5188
Modified:
trunk/agent/ChangeLog
trunk/agent/command.c
trunk/common/ChangeLog
trunk/common/get-passphrase.c
trunk/g10/ChangeLog
trunk/g10/server.c
trunk/g13/ChangeLog
trunk/g13/server.c
trunk/scd/ChangeLog
trunk/scd/command.c
trunk/sm/ChangeLog
trunk/sm/call-agent.c
trunk/sm/server.c
Log:
agent/
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
common/
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
g10/
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
scd/
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* command.c (reset_notify): Take LINE arg and return error.
(register_commands): Use assuan_handler_t type.
sm/
2009-11-02 Marcus Brinkmann <marcus at g10code.de>
* server.c (reset_notify, input_notify, output_notify): Update to
new assuan interface.
(register_commands): Use assuan_handler_t.
* call-agent.c (membuf_data_cb, default_inq_cb)
(inq_ciphertext_cb, scd_serialno_status_cb)
(scd_keypairinfo_status_cb, istrusted_status_cb)
(learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/agent/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
@@ -1,3 +1,8 @@
+2009-11-02 Marcus Brinkmann <marcus at g10code.de>
+
+ * command.c (reset_notify): Take LINE arg and return error.
+ (register_commands): Use assuan_handler_t type.
+
2009-10-16 Marcus Brinkmann <marcus at g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of
Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/common/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
@@ -1,3 +1,8 @@
+2009-11-02 Marcus Brinkmann <marcus at g10code.de>
+
+ * get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
+ type to gpg_error_t.
+
2009-10-28 Werner Koch <wk at g10code.com>
* status.h (STATUS_MOUNTPOINT): New.
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/g10/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
@@ -1,3 +1,9 @@
+2009-11-02 Marcus Brinkmann <marcus at g10code.de>
+
+ * server.c (reset_notify, input_notify, output_notify): Update to
+ new assuan interface.
+ (register_commands): Use assuan_handler_t.
+
2009-10-19 Werner Koch <wk at g10code.com>
* options.h (glo_ctrl): Add field LASTERR.
Modified: trunk/g13/ChangeLog
===================================================================
--- trunk/g13/ChangeLog 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/g13/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
@@ -1,3 +1,2 @@
-
Under initial development - no need for a ChangeLog.
Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/scd/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
@@ -1,3 +1,8 @@
+2009-11-02 Marcus Brinkmann <marcus at g10code.de>
+
+ * command.c (reset_notify): Take LINE arg and return error.
+ (register_commands): Use assuan_handler_t type.
+
2009-10-25 Werner Koch <wk at g10code.com>
* scdaemon.c (scd_deinit_default_ctrl): Release IN_DATA.
Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/sm/ChangeLog 2009-11-02 17:47:11 UTC (rev 5188)
@@ -1,3 +1,13 @@
+2009-11-02 Marcus Brinkmann <marcus at g10code.de>
+
+ * server.c (reset_notify, input_notify, output_notify): Update to
+ new assuan interface.
+ (register_commands): Use assuan_handler_t.
+ * call-agent.c (membuf_data_cb, default_inq_cb)
+ (inq_ciphertext_cb, scd_serialno_status_cb)
+ (scd_keypairinfo_status_cb, istrusted_status_cb)
+ (learn_status_cb, learn_cb, keyinfo_status_cb): Return gpg_error_t.
+
2009-10-16 Werner Koch <wk at g10code.com>
* gpgsm.c (default_include_certs): Change to -2.
Modified: trunk/agent/command.c
===================================================================
--- trunk/agent/command.c 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/agent/command.c 2009-11-02 17:47:11 UTC (rev 5188)
@@ -146,17 +146,20 @@
}
-static void
-reset_notify (assuan_context_t ctx)
+static gpg_error_t
+reset_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+ (void) line;
+
memset (ctrl->keygrip, 0, 20);
ctrl->have_keygrip = 0;
ctrl->digest.valuelen = 0;
xfree (ctrl->server_local->keydesc);
ctrl->server_local->keydesc = NULL;
+ return 0;
}
@@ -1823,7 +1826,7 @@
{
static struct {
const char *name;
- gpg_error_t (*handler)(assuan_context_t, char *line);
+ assuan_handler_t handler;
} table[] = {
{ "GETEVENTCOUNTER",cmd_geteventcounter },
{ "ISTRUSTED", cmd_istrusted },
Modified: trunk/common/get-passphrase.c
===================================================================
--- trunk/common/get-passphrase.c 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/common/get-passphrase.c 2009-11-02 17:47:11 UTC (rev 5188)
@@ -103,7 +103,7 @@
/* This is the default inquiry callback. It merely handles the
Pinentry notification. */
-static int
+static gpg_error_t
default_inq_cb (void *opaque, const char *line)
{
(void)opaque;
@@ -120,7 +120,7 @@
}
-static int
+static gpg_error_t
membuf_data_cb (void *opaque, const void *buffer, size_t length)
{
membuf_t *data = opaque;
Modified: trunk/g10/server.c
===================================================================
--- trunk/g10/server.c 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/g10/server.c 2009-11-02 17:47:11 UTC (rev 5188)
@@ -144,23 +144,26 @@
/* Called by libassuan for RESET commands. */
-static void
-reset_notify (assuan_context_t ctx)
+static gpg_error_t
+reset_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+ (void)line;
+
release_pk_list (ctrl->server_local->recplist);
ctrl->server_local->recplist = NULL;
close_message_fd (ctrl);
assuan_close_input_fd (ctx);
assuan_close_output_fd (ctx);
+ return 0;
}
/* Called by libassuan for INPUT commands. */
-static void
-input_notify (assuan_context_t ctx, const char *line)
+static gpg_error_t
+input_notify (assuan_context_t ctx, char *line)
{
/* ctrl_t ctrl = assuan_get_pointer (ctx); */
@@ -176,12 +179,13 @@
{
/* FIXME (autodetect encoding) */
}
+ return 0;
}
/* Called by libassuan for OUTPUT commands. */
-static void
-output_notify (assuan_context_t ctx, const char *line)
+static gpg_error_t
+output_notify (assuan_context_t ctx, char *line)
{
/* ctrl_t ctrl = assuan_get_pointer (ctx); */
@@ -193,6 +197,7 @@
{
/* FIXME */
}
+ return 0;
}
@@ -605,7 +610,7 @@
static struct
{
const char *name;
- gpg_error_t (*handler)(assuan_context_t, char *line);
+ assuan_handler_t handler;
} table[] = {
{ "RECIPIENT", cmd_recipient },
{ "SIGNER", cmd_signer },
Modified: trunk/g13/server.c
===================================================================
--- trunk/g13/server.c 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/g13/server.c 2009-11-02 17:47:11 UTC (rev 5188)
@@ -184,11 +184,13 @@
/* The handler for an Assuan RESET command. */
-static void
-reset_notify (assuan_context_t ctx)
+static gpg_error_t
+reset_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+ (void)line;
+
xfree (ctrl->server_local->containername);
ctrl->server_local->containername = NULL;
@@ -196,6 +198,7 @@
assuan_close_input_fd (ctx);
assuan_close_output_fd (ctx);
+ return 0;
}
@@ -539,7 +542,7 @@
{
static struct {
const char *name;
- gpg_error_t (*handler)(assuan_context_t, char *line);
+ assuan_handler_t handler;
} table[] = {
{ "OPEN", cmd_open },
{ "MOUNT", cmd_mount },
@@ -655,7 +658,7 @@
log_info ("Assuan accept problem: %s\n", gpg_strerror (err));
leave:
- reset_notify (ctx); /* Release all items hold by SERVER_LOCAL. */
+ reset_notify (ctx, NULL); /* Release all items hold by SERVER_LOCAL. */
if (ctrl->server_local)
{
xfree (ctrl->server_local);
Modified: trunk/scd/command.c
===================================================================
--- trunk/scd/command.c 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/scd/command.c 2009-11-02 17:47:11 UTC (rev 5188)
@@ -338,12 +338,15 @@
}
-static void
-reset_notify (assuan_context_t ctx)
+static gpg_error_t
+reset_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+ (void) line;
+
do_reset (ctrl, 1);
+ return 0;
}
@@ -1843,7 +1846,7 @@
{
static struct {
const char *name;
- gpg_error_t (*handler)(assuan_context_t, char *line);
+ assuan_handler_t handler;
} table[] = {
{ "SERIALNO", cmd_serialno },
{ "LEARN", cmd_learn },
Modified: trunk/sm/call-agent.c
===================================================================
--- trunk/sm/call-agent.c 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/sm/call-agent.c 2009-11-02 17:47:11 UTC (rev 5188)
@@ -111,7 +111,7 @@
-static int
+static gpg_error_t
membuf_data_cb (void *opaque, const void *buffer, size_t length)
{
membuf_t *data = opaque;
@@ -124,7 +124,7 @@
/* This is the default inquiry callback. It mainly handles the
Pinentry notifications. */
-static int
+static gpg_error_t
default_inq_cb (void *opaque, const char *line)
{
gpg_error_t err;
@@ -301,7 +301,7 @@
/* Handle a CIPHERTEXT inquiry. Note, we only send the data,
assuan_transact talkes care of flushing and writing the end */
-static int
+static gpg_error_t
inq_ciphertext_cb (void *opaque, const char *line)
{
struct cipher_parm_s *parm = opaque;
@@ -423,7 +423,7 @@
/* Handle a KEYPARMS inquiry. Note, we only send the data,
assuan_transact takes care of flushing and writing the end */
-static int
+static gpg_error_t
inq_genkey_parms (void *opaque, const char *line)
{
struct genkey_parm_s *parm = opaque;
@@ -561,7 +561,7 @@
/* Callback for the gpgsm_agent_serialno fucntion. */
-static int
+static gpg_error_t
scd_serialno_status_cb (void *opaque, const char *line)
{
char **r_serialno = opaque;
@@ -613,7 +613,7 @@
/* Callback for the gpgsm_agent_serialno fucntion. */
-static int
+static gpg_error_t
scd_keypairinfo_status_cb (void *opaque, const char *line)
{
strlist_t *listaddr = opaque;
@@ -681,7 +681,7 @@
-static int
+static gpg_error_t
istrusted_status_cb (void *opaque, const char *line)
{
struct rootca_flags_s *flags = opaque;
@@ -812,7 +812,7 @@
}
-static int
+static gpg_error_t
learn_status_cb (void *opaque, const char *line)
{
struct learn_parm_s *parm = opaque;
@@ -831,7 +831,7 @@
return 0;
}
-static int
+static gpg_error_t
learn_cb (void *opaque, const void *buffer, size_t length)
{
struct learn_parm_s *parm = opaque;
@@ -1002,7 +1002,7 @@
-static int
+static gpg_error_t
keyinfo_status_cb (void *opaque, const char *line)
{
char **serialno = opaque;
Modified: trunk/sm/server.c
===================================================================
--- trunk/sm/server.c 2009-10-28 12:02:15 UTC (rev 5187)
+++ trunk/sm/server.c 2009-11-02 17:47:11 UTC (rev 5188)
@@ -308,11 +308,13 @@
}
-static void
-reset_notify (assuan_context_t ctx)
+static gpg_error_t
+reset_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+ (void) line;
+
gpgsm_release_certlist (ctrl->server_local->recplist);
gpgsm_release_certlist (ctrl->server_local->signerlist);
ctrl->server_local->recplist = NULL;
@@ -320,11 +322,12 @@
close_message_fd (ctrl);
assuan_close_input_fd (ctx);
assuan_close_output_fd (ctx);
+ return 0;
}
-static void
-input_notify (assuan_context_t ctx, const char *line)
+static gpg_error_t
+input_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
@@ -339,10 +342,11 @@
;
else
ctrl->autodetect_encoding = 1;
+ return 0;
}
-static void
-output_notify (assuan_context_t ctx, const char *line)
+static gpg_error_t
+output_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
@@ -352,6 +356,7 @@
ctrl->create_pem = 1;
else if (strstr (line, "--base64"))
ctrl->create_base64 = 1; /* just the raw output */
+ return 0;
}
@@ -1100,7 +1105,7 @@
{
static struct {
const char *name;
- gpg_error_t (*handler)(assuan_context_t, char *line);
+ assuan_handler_t handler;
} table[] = {
{ "RECIPIENT", cmd_recipient },
{ "SIGNER", cmd_signer },
More information about the Gnupg-commits
mailing list