security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Added KEYINFO field to show the protection type of a key. This differs from the second field which shows the location of the key.

This commit is contained in:
Ben Kibbey 2011-04-06 19:23:05 -04:00 committed by Werner Koch
parent f1e9f510ec
commit 893b455a3d
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-06 Ben Kibbey <bjk@luxsci.net>
* command.c: (do_one_keyinfo): Add protection type field.
2011-03-10 Werner Koch <wk@g10code.com>
* protect.c (hash_passphrase): Use the new gcry_kdf_derive.

31
agent/command.c
View File

@ -938,7 +938,7 @@ static const char hlp_keyinfo[] =
"available keys are returned. The information is returned as a\n"
"status line unless --data was specified, with this format:\n"
"\n"
" KEYINFO <keygrip> <type> <serialno> <idstr> <cached>\n"
" KEYINFO <keygrip> <type> <serialno> <idstr> <cached> <protection>\n"
"\n"
"KEYGRIP is the keygrip.\n"
"\n"
@ -957,6 +957,11 @@ static const char hlp_keyinfo[] =
"CACHED is 1 if the passphrase for the key was found in the key cache.\n"
" If not, a '-' is used instead.\n"
"\n"
"PROTECTION describes the key protection type:\n"
" 'P' - The key is protected with a passphrase,\n"
" 'C' - The key is not protected,\n"
" '-' - Unknown protection.\n"
"\n"
"More information may be added in the future.";
static gpg_error_t
do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
@ -970,6 +975,7 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
char *idstr = NULL;
const char *keytypestr;
const char *cached;
const char *protectionstr;
char *pw;
err = agent_key_info_from_file (ctrl, grip, &keytype, &shadow_info);
@ -979,13 +985,17 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
/* Reformat the grip so that we use uppercase as good style. */
bin2hex (grip, 20, hexgrip);
if (keytype == PRIVATE_KEY_CLEAR
|| keytype == PRIVATE_KEY_PROTECTED)
keytypestr = "D";
else if (keytype == PRIVATE_KEY_SHADOWED)
keytypestr = "T";
else
keytypestr = "-";
switch (keytype)
{
case PRIVATE_KEY_CLEAR: protectionstr = "C"; keytypestr = "D";
break;
case PRIVATE_KEY_PROTECTED: protectionstr = "P"; keytypestr = "D";
break;
case PRIVATE_KEY_SHADOWED: protectionstr = "-"; keytypestr = "T";
break;
default: protectionstr = "-"; keytypestr = "-";
break;
}
/* Here we have a little race by doing the cache check separately
from the retrieval function. Given that the cache flag is only a
@ -1008,15 +1018,16 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
serialno? serialno : "-",
idstr? idstr : "-",
cached,
protectionstr,
NULL);
else
{
char *string;
string = xtryasprintf ("%s %s %s %s %s\n",
string = xtryasprintf ("%s %s %s %s %s %s\n",
hexgrip, keytypestr,
serialno? serialno : "-",
idstr? idstr : "-", cached);
idstr? idstr : "-", cached, protectionstr);
if (!string)
err = gpg_error_from_syserror ();
else