From 6594dc31f58916b6f8b31de070e85d56221e3b94 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 19 Nov 2020 09:06:31 +0100 Subject: [PATCH] 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 (cherry picked from commit 4070f302e4decc8d54d1305cbd30f6dab052ef7e) --- dirmngr/dirmngr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index e497183c1..509cb9e3e 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -2368,7 +2368,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++) @@ -2400,8 +2400,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);