security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

agent/

Browse Source 
2009-11-02  Marcus Brinkmann  <marcus@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@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@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@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@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.
This commit is contained in:
Marcus Brinkmann 2009-11-02 17:47:11 +00:00
parent a1b6142855
commit 717c38381a
13 changed files with 86 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-02 Marcus Brinkmann <marcus@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@g10code.com> 2009-10-16 Marcus Brinkmann <marcus@g10code.com>
* gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of * gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of

9
agent/command.c
View File

@ -146,17 +146,20 @@ write_and_clear_outbuf (assuan_context_t ctx, membuf_t *mb)
} }
static void static gpg_error_t
reset_notify (assuan_context_t ctx) reset_notify (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
(void) line;
memset (ctrl->keygrip, 0, 20); memset (ctrl->keygrip, 0, 20);
ctrl->have_keygrip = 0; ctrl->have_keygrip = 0;
ctrl->digest.valuelen = 0; ctrl->digest.valuelen = 0;
xfree (ctrl->server_local->keydesc); xfree (ctrl->server_local->keydesc);
ctrl->server_local->keydesc = NULL; ctrl->server_local->keydesc = NULL;
return 0;
} }
@ -1823,7 +1826,7 @@ register_commands (assuan_context_t ctx)
{ {
static struct { static struct {
const char *name; const char *name;
gpg_error_t (*handler)(assuan_context_t, char *line); assuan_handler_t handler;
} table[] = { } table[] = {
{ "GETEVENTCOUNTER",cmd_geteventcounter }, { "GETEVENTCOUNTER",cmd_geteventcounter },
{ "ISTRUSTED", cmd_istrusted }, { "ISTRUSTED", cmd_istrusted },

5
common/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-02 Marcus Brinkmann <marcus@g10code.de>
* get-passphrase.c (default_inq_cb, membuf_data_cb): Change return
type to gpg_error_t.
2009-10-28 Werner Koch <wk@g10code.com> 2009-10-28 Werner Koch <wk@g10code.com>
* status.h (STATUS_MOUNTPOINT): New. * status.h (STATUS_MOUNTPOINT): New.

4
common/get-passphrase.c
View File

@ -103,7 +103,7 @@ start_agent (void)
/* This is the default inquiry callback. It merely handles the /* This is the default inquiry callback. It merely handles the
Pinentry notification. */ Pinentry notification. */
static int static gpg_error_t
default_inq_cb (void *opaque, const char *line) default_inq_cb (void *opaque, const char *line)
{ {
(void)opaque; (void)opaque;
@ -120,7 +120,7 @@ default_inq_cb (void *opaque, const char *line)
} }
static int static gpg_error_t
membuf_data_cb (void *opaque, const void *buffer, size_t length) membuf_data_cb (void *opaque, const void *buffer, size_t length)
{ {
membuf_t *data = opaque; membuf_t *data = opaque;

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-02 Marcus Brinkmann <marcus@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@g10code.com> 2009-10-19 Werner Koch <wk@g10code.com>
* options.h (glo_ctrl): Add field LASTERR. * options.h (glo_ctrl): Add field LASTERR.

19
g10/server.c
View File

@ -144,23 +144,26 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
/* Called by libassuan for RESET commands. */ /* Called by libassuan for RESET commands. */
static void static gpg_error_t
reset_notify (assuan_context_t ctx) reset_notify (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
(void)line;
release_pk_list (ctrl->server_local->recplist); release_pk_list (ctrl->server_local->recplist);
ctrl->server_local->recplist = NULL; ctrl->server_local->recplist = NULL;
close_message_fd (ctrl); close_message_fd (ctrl);
assuan_close_input_fd (ctx); assuan_close_input_fd (ctx);
assuan_close_output_fd (ctx); assuan_close_output_fd (ctx);
return 0;
} }
/* Called by libassuan for INPUT commands. */ /* Called by libassuan for INPUT commands. */
static void static gpg_error_t
input_notify (assuan_context_t ctx, const char *line) input_notify (assuan_context_t ctx, char *line)
{ {
/* ctrl_t ctrl = assuan_get_pointer (ctx); */ /* ctrl_t ctrl = assuan_get_pointer (ctx); */
@ -176,12 +179,13 @@ input_notify (assuan_context_t ctx, const char *line)
{ {
/* FIXME (autodetect encoding) */ /* FIXME (autodetect encoding) */
} }
return 0;
} }
/* Called by libassuan for OUTPUT commands. */ /* Called by libassuan for OUTPUT commands. */
static void static gpg_error_t
output_notify (assuan_context_t ctx, const char *line) output_notify (assuan_context_t ctx, char *line)
{ {
/* ctrl_t ctrl = assuan_get_pointer (ctx); */ /* ctrl_t ctrl = assuan_get_pointer (ctx); */
@ -193,6 +197,7 @@ output_notify (assuan_context_t ctx, const char *line)
{ {
/* FIXME */ /* FIXME */
} }
return 0;
} }
@ -605,7 +610,7 @@ register_commands (assuan_context_t ctx)
static struct static struct
{ {
const char *name; const char *name;
gpg_error_t (*handler)(assuan_context_t, char *line); assuan_handler_t handler;
} table[] = { } table[] = {
{ "RECIPIENT", cmd_recipient }, { "RECIPIENT", cmd_recipient },
{ "SIGNER", cmd_signer }, { "SIGNER", cmd_signer },

1
g13/ChangeLog
View File

@ -1,3 +1,2 @@
Under initial development - no need for a ChangeLog. Under initial development - no need for a ChangeLog.

11
g13/server.c
View File

@ -184,11 +184,13 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
/* The handler for an Assuan RESET command. */ /* The handler for an Assuan RESET command. */
static void static gpg_error_t
reset_notify (assuan_context_t ctx) reset_notify (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
(void)line;
xfree (ctrl->server_local->containername); xfree (ctrl->server_local->containername);
ctrl->server_local->containername = NULL; ctrl->server_local->containername = NULL;
@ -196,6 +198,7 @@ reset_notify (assuan_context_t ctx)
assuan_close_input_fd (ctx); assuan_close_input_fd (ctx);
assuan_close_output_fd (ctx); assuan_close_output_fd (ctx);
return 0;
} }
@ -539,7 +542,7 @@ register_commands (assuan_context_t ctx)
{ {
static struct { static struct {
const char *name; const char *name;
gpg_error_t (*handler)(assuan_context_t, char *line); assuan_handler_t handler;
} table[] = { } table[] = {
{ "OPEN", cmd_open }, { "OPEN", cmd_open },
{ "MOUNT", cmd_mount }, { "MOUNT", cmd_mount },
@ -655,7 +658,7 @@ g13_server (ctrl_t ctrl)
log_info ("Assuan accept problem: %s\n", gpg_strerror (err)); log_info ("Assuan accept problem: %s\n", gpg_strerror (err));
leave: 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) if (ctrl->server_local)
{ {
xfree (ctrl->server_local); xfree (ctrl->server_local);

5
scd/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-02 Marcus Brinkmann <marcus@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@g10code.com> 2009-10-25 Werner Koch <wk@g10code.com>
* scdaemon.c (scd_deinit_default_ctrl): Release IN_DATA. * scdaemon.c (scd_deinit_default_ctrl): Release IN_DATA.

9
scd/command.c
View File

@ -338,12 +338,15 @@ do_reset (ctrl_t ctrl, int send_reset)
} }
static void static gpg_error_t
reset_notify (assuan_context_t ctx) reset_notify (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
(void) line;
do_reset (ctrl, 1); do_reset (ctrl, 1);
return 0;
} }
@ -1843,7 +1846,7 @@ register_commands (assuan_context_t ctx)
{ {
static struct { static struct {
const char *name; const char *name;
gpg_error_t (*handler)(assuan_context_t, char *line); assuan_handler_t handler;
} table[] = { } table[] = {
{ "SERIALNO", cmd_serialno }, { "SERIALNO", cmd_serialno },
{ "LEARN", cmd_learn }, { "LEARN", cmd_learn },

10
sm/ChangeLog
View File

@ -1,3 +1,13 @@
2009-11-02 Marcus Brinkmann <marcus@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@g10code.com> 2009-10-16 Werner Koch <wk@g10code.com>
* gpgsm.c (default_include_certs): Change to -2. * gpgsm.c (default_include_certs): Change to -2.

20
sm/call-agent.c
View File

@ -111,7 +111,7 @@ start_agent (ctrl_t ctrl)
static int static gpg_error_t
membuf_data_cb (void *opaque, const void *buffer, size_t length) membuf_data_cb (void *opaque, const void *buffer, size_t length)
{ {
membuf_t *data = opaque; membuf_t *data = opaque;
@ -124,7 +124,7 @@ membuf_data_cb (void *opaque, const void *buffer, size_t length)
/* This is the default inquiry callback. It mainly handles the /* This is the default inquiry callback. It mainly handles the
Pinentry notifications. */ Pinentry notifications. */
static int static gpg_error_t
default_inq_cb (void *opaque, const char *line) default_inq_cb (void *opaque, const char *line)
{ {
gpg_error_t err; gpg_error_t err;
@ -301,7 +301,7 @@ gpgsm_scd_pksign (ctrl_t ctrl, const char *keyid, const char *desc,
/* Handle a CIPHERTEXT inquiry. Note, we only send the data, /* Handle a CIPHERTEXT inquiry. Note, we only send the data,
assuan_transact talkes care of flushing and writing the end */ assuan_transact talkes care of flushing and writing the end */
static int static gpg_error_t
inq_ciphertext_cb (void *opaque, const char *line) inq_ciphertext_cb (void *opaque, const char *line)
{ {
struct cipher_parm_s *parm = opaque; struct cipher_parm_s *parm = opaque;
@ -423,7 +423,7 @@ gpgsm_agent_pkdecrypt (ctrl_t ctrl, const char *keygrip, const char *desc,
/* Handle a KEYPARMS inquiry. Note, we only send the data, /* Handle a KEYPARMS inquiry. Note, we only send the data,
assuan_transact takes care of flushing and writing the end */ assuan_transact takes care of flushing and writing the end */
static int static gpg_error_t
inq_genkey_parms (void *opaque, const char *line) inq_genkey_parms (void *opaque, const char *line)
{ {
struct genkey_parm_s *parm = opaque; struct genkey_parm_s *parm = opaque;
@ -561,7 +561,7 @@ store_serialno (const char *line)
/* Callback for the gpgsm_agent_serialno fucntion. */ /* Callback for the gpgsm_agent_serialno fucntion. */
static int static gpg_error_t
scd_serialno_status_cb (void *opaque, const char *line) scd_serialno_status_cb (void *opaque, const char *line)
{ {
char **r_serialno = opaque; char **r_serialno = opaque;
@ -613,7 +613,7 @@ gpgsm_agent_scd_serialno (ctrl_t ctrl, char **r_serialno)
/* Callback for the gpgsm_agent_serialno fucntion. */ /* Callback for the gpgsm_agent_serialno fucntion. */
static int static gpg_error_t
scd_keypairinfo_status_cb (void *opaque, const char *line) scd_keypairinfo_status_cb (void *opaque, const char *line)
{ {
strlist_t *listaddr = opaque; strlist_t *listaddr = opaque;
@ -681,7 +681,7 @@ gpgsm_agent_scd_keypairinfo (ctrl_t ctrl, strlist_t *r_list)
static int static gpg_error_t
istrusted_status_cb (void *opaque, const char *line) istrusted_status_cb (void *opaque, const char *line)
{ {
struct rootca_flags_s *flags = opaque; struct rootca_flags_s *flags = opaque;
@ -812,7 +812,7 @@ gpgsm_agent_havekey (ctrl_t ctrl, const char *hexkeygrip)
} }
static int static gpg_error_t
learn_status_cb (void *opaque, const char *line) learn_status_cb (void *opaque, const char *line)
{ {
struct learn_parm_s *parm = opaque; struct learn_parm_s *parm = opaque;
@ -831,7 +831,7 @@ learn_status_cb (void *opaque, const char *line)
return 0; return 0;
} }
static int static gpg_error_t
learn_cb (void *opaque, const void *buffer, size_t length) learn_cb (void *opaque, const void *buffer, size_t length)
{ {
struct learn_parm_s *parm = opaque; struct learn_parm_s *parm = opaque;
@ -1002,7 +1002,7 @@ gpgsm_agent_send_nop (ctrl_t ctrl)
static int static gpg_error_t
keyinfo_status_cb (void *opaque, const char *line) keyinfo_status_cb (void *opaque, const char *line)
{ {
char **serialno = opaque; char **serialno = opaque;

19
sm/server.c
View File

@ -308,11 +308,13 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
} }
static void static gpg_error_t
reset_notify (assuan_context_t ctx) reset_notify (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
(void) line;
gpgsm_release_certlist (ctrl->server_local->recplist); gpgsm_release_certlist (ctrl->server_local->recplist);
gpgsm_release_certlist (ctrl->server_local->signerlist); gpgsm_release_certlist (ctrl->server_local->signerlist);
ctrl->server_local->recplist = NULL; ctrl->server_local->recplist = NULL;
@ -320,11 +322,12 @@ reset_notify (assuan_context_t ctx)
close_message_fd (ctrl); close_message_fd (ctrl);
assuan_close_input_fd (ctx); assuan_close_input_fd (ctx);
assuan_close_output_fd (ctx); assuan_close_output_fd (ctx);
return 0;
} }
static void static gpg_error_t
input_notify (assuan_context_t ctx, const char *line) input_notify (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
@ -339,10 +342,11 @@ input_notify (assuan_context_t ctx, const char *line)
; ;
else else
ctrl->autodetect_encoding = 1; ctrl->autodetect_encoding = 1;
return 0;
} }
static void static gpg_error_t
output_notify (assuan_context_t ctx, const char *line) output_notify (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
@ -352,6 +356,7 @@ output_notify (assuan_context_t ctx, const char *line)
ctrl->create_pem = 1; ctrl->create_pem = 1;
else if (strstr (line, "--base64")) else if (strstr (line, "--base64"))
ctrl->create_base64 = 1; /* just the raw output */ ctrl->create_base64 = 1; /* just the raw output */
return 0;
} }
@ -1100,7 +1105,7 @@ register_commands (assuan_context_t ctx)
{ {
static struct { static struct {
const char *name; const char *name;
gpg_error_t (*handler)(assuan_context_t, char *line); assuan_handler_t handler;
} table[] = { } table[] = {
{ "RECIPIENT", cmd_recipient }, { "RECIPIENT", cmd_recipient },
{ "SIGNER", cmd_signer }, { "SIGNER", cmd_signer },