security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-07 23:27:48 +02:00
Code Activity

Added option --data to KEYINFO to return the result with a data response.

Browse Source
This commit is contained in:
Ben Kibbey 2011-03-01 21:18:45 -05:00 committed by Werner Koch
parent fa58a834ff
commit cb803a4b27
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
agent/command.c
View File

@ -930,13 +930,13 @@ cmd_readkey (assuan_context_t ctx, char *line)
static const char hlp_keyinfo[] = static const char hlp_keyinfo[] =
"KEYINFO [--list] <keygrip>\n" "KEYINFO [--list] [--data] <keygrip>\n"
"\n" "\n"
"Return information about the key specified by the KEYGRIP. If the\n" "Return information about the key specified by the KEYGRIP. If the\n"
"key is not available GPG_ERR_NOT_FOUND is returned. If the option\n" "key is not available GPG_ERR_NOT_FOUND is returned. If the option\n"
"--list is given the keygrip is ignored and information about all\n" "--list is given the keygrip is ignored and information about all\n"
"available keys are returned. The information is returned as a\n" "available keys are returned. The information is returned as a\n"
"status line with this format:\n" "status line unless --data was specified, with this format:\n"
"\n" "\n"
" KEYINFO <keygrip> <type> <serialno> <idstr> <cached>\n" " KEYINFO <keygrip> <type> <serialno> <idstr> <cached>\n"
"\n" "\n"
@ -959,7 +959,8 @@ static const char hlp_keyinfo[] =
"\n" "\n"
"More information may be added in the future."; "More information may be added in the future.";
static gpg_error_t static gpg_error_t
do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip) do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
int data)
{ {
gpg_error_t err; gpg_error_t err;
char hexgrip[40+1]; char hexgrip[40+1];
@ -997,13 +998,25 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip)
goto leave; goto leave;
} }
err = agent_write_status (ctrl, "KEYINFO", if (!data)
hexgrip, err = agent_write_status (ctrl, "KEYINFO",
keytypestr, hexgrip,
serialno? serialno : "-", keytypestr,
idstr? idstr : "-", serialno? serialno : "-",
cached, idstr? idstr : "-",
NULL); cached,
NULL);
else {
char *string = xtryasprintf ("%s %s %s %s %s\n", hexgrip, keytypestr,
serialno? serialno : "-", idstr? idstr : "-", cached);
if (!string)
err = gpg_error_from_syserror ();
err = assuan_send_data(ctx, string, strlen(string));
xfree(string);
}
leave: leave:
xfree (shadow_info); xfree (shadow_info);
xfree (serialno); xfree (serialno);
@ -1020,8 +1033,10 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
unsigned char grip[20]; unsigned char grip[20];
DIR *dir = NULL; DIR *dir = NULL;
int list_mode; int list_mode;
int opt_data;
list_mode = has_option (line, "--list"); list_mode = has_option (line, "--list");
opt_data = has_option (line, "--data");
line = skip_options (line); line = skip_options (line);
if (list_mode) if (list_mode)
@ -1056,7 +1071,7 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
if ( hex2bin (hexgrip, grip, 20) < 0 ) if ( hex2bin (hexgrip, grip, 20) < 0 )
continue; /* Bad hex string. */ continue; /* Bad hex string. */
err = do_one_keyinfo (ctrl, grip); err = do_one_keyinfo (ctrl, grip, ctx, opt_data);
if (err) if (err)
goto leave; goto leave;
} }
@ -1067,7 +1082,7 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
err = parse_keygrip (ctx, line, grip); err = parse_keygrip (ctx, line, grip);
if (err) if (err)
goto leave; goto leave;
err = do_one_keyinfo (ctrl, grip); err = do_one_keyinfo (ctrl, grip, ctx, opt_data);
} }
leave: leave: