aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyid.c
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2016-02-07 23:31:35 +0000
committerNeal H. Walfield <[email protected]>2016-02-14 13:46:20 +0000
commitc0268c449d0f3d23be5ec7b92fe92e7e078166cf (patch)
tree43e95ef8096ba8801141f7c97a8f7d28e75b92a7 /g10/keyid.c
parentcommon: Fix comment. (diff)
downloadgnupg-c0268c449d0f3d23be5ec7b92fe92e7e078166cf.tar.gz
gnupg-c0268c449d0f3d23be5ec7b92fe92e7e078166cf.zip
gpg: Fix format_keyid when dynamically allocating the buffer.
* g10/keyid.c (format_keyid): Return a char *, not a const char *. If BUFFER is NULL, then set LEN to the static buffer's size. -- Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to 'g10/keyid.c')
-rw-r--r--g10/keyid.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/g10/keyid.c b/g10/keyid.c
index f6842762e..49eb5f6d5 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -274,12 +274,15 @@ v3_keyid (gcry_mpi_t a, u32 *ki)
}
-const char *
+char *
format_keyid (u32 *keyid, int format, char *buffer, int len)
{
char tmp[KEYID_STR_SIZE];
if (! buffer)
- buffer = tmp;
+ {
+ buffer = tmp;
+ len = sizeof (tmp);
+ }
if (format == KF_DEFAULT)
format = opt.keyid_format;