security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-12 22:11:29 +02:00
Code Activity

gpg: Add function format_keyid.

Browse Source 
* g10/options.h (opt.keyid_format): Add new value KF_DEFAULT.
* g10/keyid.c (format_keyid): New function.
(keystr): Use it.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2015-11-17 11:47:43 +01:00
parent eae982ed6d
commit a052c30d31
3 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
g10/keydb.h
View File

@ -786,6 +786,7 @@ char *pubkey_string (PKT_public_key *pk, char *buffer, size_t bufsize);
#define PUBKEY_STRING_SIZE 32 #define PUBKEY_STRING_SIZE 32
u32 v3_keyid (gcry_mpi_t a, u32 *ki); u32 v3_keyid (gcry_mpi_t a, u32 *ki);
void hash_public_key( gcry_md_hd_t md, PKT_public_key *pk ); void hash_public_key( gcry_md_hd_t md, PKT_public_key *pk );
const char *format_keyid (u32 *keyid, int format, char *buffer, int len);
size_t keystrlen(void); size_t keystrlen(void);
const char *keystr(u32 *keyid); const char *keystr(u32 *keyid);
const char *keystr_with_sub (u32 *main_kid, u32 *sub_kid); const char *keystr_with_sub (u32 *main_kid, u32 *sub_kid);

80
g10/keyid.c
View File

@ -274,6 +274,53 @@ v3_keyid (gcry_mpi_t a, u32 *ki)
} }
const char *
format_keyid (u32 *keyid, int format, char *buffer, int len)
{
char tmp[KEYID_STR_SIZE];
if (! buffer)
buffer = tmp;
if (format == KF_DEFAULT)
format = opt.keyid_format;
if (format == KF_DEFAULT)
format = KF_0xLONG;
switch (format)
{
case KF_SHORT:
snprintf (buffer, len, "%08lX", (ulong)keyid[1]);
break;
case KF_LONG:
if (keyid[0])
snprintf (buffer, len, "%08lX%08lX",
(ulong)keyid[0], (ulong)keyid[1]);
else
snprintf (buffer, len, "%08lX", (ulong)keyid[1]);
break;
case KF_0xSHORT:
snprintf (buffer, len, "0x%08lX", (ulong)keyid[1]);
break;
case KF_0xLONG:
if(keyid[0])
snprintf (buffer, len, "0x%08lX%08lX",
(ulong)keyid[0],(ulong)keyid[1]);
else
snprintf (buffer, len, "0x%08lX", (ulong)keyid[1]);
break;
default:
BUG();
}
if (buffer == tmp)
return xstrdup (buffer);
return buffer;
}
size_t size_t
keystrlen(void) keystrlen(void)
{ {
@ -301,38 +348,7 @@ const char *
keystr (u32 *keyid) keystr (u32 *keyid)
{ {
static char keyid_str[KEYID_STR_SIZE]; static char keyid_str[KEYID_STR_SIZE];
return format_keyid (keyid, opt.keyid_format, keyid_str, sizeof (keyid_str));
switch (opt.keyid_format)
{
case KF_SHORT:
snprintf (keyid_str, sizeof keyid_str, "%08lX", (ulong)keyid[1]);
break;
case KF_LONG:
if (keyid[0])
snprintf (keyid_str, sizeof keyid_str, "%08lX%08lX",
(ulong)keyid[0], (ulong)keyid[1]);
else
snprintf (keyid_str, sizeof keyid_str, "%08lX", (ulong)keyid[1]);
break;
case KF_0xSHORT:
snprintf (keyid_str, sizeof keyid_str, "0x%08lX", (ulong)keyid[1]);
break;
case KF_0xLONG:
if(keyid[0])
snprintf (keyid_str, sizeof keyid_str, "0x%08lX%08lX",
(ulong)keyid[0],(ulong)keyid[1]);
else
snprintf (keyid_str, sizeof keyid_str, "0x%08lX", (ulong)keyid[1]);
break;
default:
BUG();
}
return keyid_str;
} }

2
g10/options.h
View File

@ -136,7 +136,7 @@ struct
} compliance; } compliance;
enum enum
{ {
KF_SHORT, KF_LONG, KF_0xSHORT, KF_0xLONG KF_DEFAULT, KF_SHORT, KF_LONG, KF_0xSHORT, KF_0xLONG
} keyid_format; } keyid_format;
int shm_coprocess; int shm_coprocess;
const char *set_filename; const char *set_filename;