diff options
Diffstat (limited to '')
| -rw-r--r-- | agent/ChangeLog | 5 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 25 |
2 files changed, 30 insertions, 0 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index c22797d34..b8f30e879 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,8 @@ +2008-11-18 Werner Koch <[email protected]> + + * gpg-agent.c (make_libversion): New. + (my_strusage): Print libgcrypt version + 2008-11-11 Werner Koch <[email protected]> * call-scd.c (membuf_data_cb): Change return type to diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index ad12b1870..454d71590 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -280,11 +280,30 @@ static unsigned long pth_thread_id (void) Functions. */ +static char * +make_libversion (const char *libname, const char *(*getfnc)(const char*)) +{ + const char *s; + char *result; + + if (maybe_setuid) + { + gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */ + maybe_setuid = 0; + } + s = getfnc (NULL); + result = xmalloc (strlen (libname) + 1 + strlen (s) + 1); + strcpy (stpcpy (stpcpy (result, libname), " "), s); + return result; +} + static const char * my_strusage (int level) { + static char *ver_gcry; const char *p; + switch (level) { case 11: p = "gpg-agent (GnuPG)"; @@ -293,6 +312,12 @@ my_strusage (int level) case 17: p = PRINTABLE_OS_NAME; break; case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); break; + case 20: + if (!ver_gcry) + ver_gcry = make_libversion ("libgcrypt", gcry_check_version); + p = ver_gcry; + break; + case 1: case 40: p = _("Usage: gpg-agent [options] (-h for help)"); break; |