diff options
| author | Werner Koch <[email protected]> | 2024-11-15 08:36:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-11-18 07:58:32 +0000 |
| commit | 269d1ea10c383bc421d3be8cf6ca7f722c09d470 (patch) | |
| tree | f74b6a73d50dd3e9effe180a87dbaba226313b62 | |
| parent | scd: Fix a memory leak. (diff) | |
| download | gnupg-269d1ea10c383bc421d3be8cf6ca7f722c09d470.tar.gz gnupg-269d1ea10c383bc421d3be8cf6ca7f722c09d470.zip | |
gpgconf: Include a minimal secure version in the --query-swdb output.
* tools/gpgconf.c (query_swdb): Parse the new minver tag.
| -rw-r--r-- | tools/gpgconf.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/gpgconf.c b/tools/gpgconf.c index e15271d7a..01695b0ca 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -434,7 +434,7 @@ valid_swdb_name_p (const char *name) * 'c' :: The version is Current * 'n' :: The current version is already Newer than the * available one. - * urgency :: If the value is greater than zero an urgent update is required. + * minvers :: The minimal secure version. * error :: 0 on success or an gpg_err_code_t * Common codes seen: * GPG_ERR_TOO_OLD :: The SWDB file is to old to be used. @@ -465,6 +465,7 @@ query_swdb (estream_t out, const char *name, const char *current_version) gnupg_isotime_t filedate = {0}; gnupg_isotime_t verified = {0}; char *value_ver = NULL; + char *value_minver = NULL; gnupg_isotime_t value_date = {0}; char *value_size = NULL; char *value_sha2 = NULL; @@ -567,6 +568,8 @@ query_swdb (estream_t out, const char *name, const char *current_version) value_size = xstrdup (fields[1]); else if (!strcmp (p, "sha2") && !value_sha2) value_sha2 = xstrdup (fields[1]); + else if (!strcmp (p, "minver") && !value_minver) + value_minver = xstrdup (fields[1]); } } if (len < 0 || es_ferror (fp)) @@ -617,10 +620,11 @@ query_swdb (estream_t out, const char *name, const char *current_version) else status = 'n'; - es_fprintf (out, "%s:%s:%c::%d:%s:%s:%s:%s:%lu:%s:\n", + es_fprintf (out, "%s:%s:%c:%s:%d:%s:%s:%s:%s:%lu:%s:\n", name, current_version? current_version : "", status, + value_minver? value_minver : value_ver, err, filedate, verified, @@ -630,6 +634,7 @@ query_swdb (estream_t out, const char *name, const char *current_version) value_sha2? value_sha2 : ""); leave: + xfree (value_minver); xfree (value_ver); xfree (value_size); xfree (value_sha2); |