diff options
| author | Werner Koch <wk@gnupg.org> | 2020-11-19 09:06:31 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-11-19 09:09:31 +0100 |
| commit | 4070f302e4decc8d54d1305cbd30f6dab052ef7e (patch) | |
| tree | b735416ce43a0b7114dbbcfe0f3939acf5a59d64 | |
| parent | 8ddadbbdbbe20b9e87eb2bfa142577e26dae297e (diff) | |
| download | gnupg-4070f302e4decc8d54d1305cbd30f6dab052ef7e.tar.gz | |
gpgconf: Also print revision of libksba.
* dirmngr/dirmngr.c (get_revision_from_blurb): Fix detection of empty
string.
(gpgconf_versions): Print ksba revision.
--
The latest Libksba version support retrieving of the revision (commit)
id. We now use that or print a question mark.
Signed-off-by: Werner Koch <wk@gnupg.org>
| -rw-r--r-- | dirmngr/dirmngr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 06bb4bae6..33de686f5 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -2348,7 +2348,7 @@ get_revision_from_blurb (const char *blurb, int *r_len) for (; *s; s++) if (*s == '\n' && s[1] == '(') break; - if (s) + if (*s) { s += 2; for (n=0; s[n] && s[n] != ' '; n++) @@ -2380,8 +2380,9 @@ gpgconf_versions (void) es_fprintf (es_stdout, "* Libassuan %s (%.*s)\n\n", assuan_check_version (NULL), n, s); - es_fprintf (es_stdout, "* KSBA %s \n\n", - ksba_check_version (NULL)); + s = get_revision_from_blurb (ksba_check_version ("\x01\x01"), &n); + es_fprintf (es_stdout, "* KSBA %s (%.*s)\n\n", + ksba_check_version (NULL), n, s); #ifdef HTTP_USE_NTBTLS s = get_revision_from_blurb (ntbtls_check_version ("\x01\x01"), &n); |