From 120b14783c0312d782dc08ce4949a6209d5ccc7b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 7 Sep 2016 09:26:11 +0200 Subject: core,cpp: Extend the TOFU information. * src/gpgme.h.in (struct _gpeme_tofu_info): Rename FIRSTSEEN to SIGNFIRST and LASTSEEN to SIGNLAST. Add ENCRFIST and ENCRLAST. * src/keylist.c (parse_tfs_record): Parse to ENCRFIRST and ENCRLAST. * src/verify.c (parse_tofu_stats): Ditto. * tests/run-keylist.c (main): Adjust and print encrypt stats. * tests/run-verify.c (print_result): Ditto. * lang/cpp/src/tofuinfo.h (TofuInfo): Rename firstSeen to signFirst and lastSeen to signLast. Add encrCount, encrFirst and encrLast. * lang/cpp/src/tofuinfo.cpp (encrCount, encrFirst, encrLast): New. -- The latest GnuPG commits have the needed changes but we also allow the use of currently released GnuPG version. Signed-off-by: Werner Koch --- tests/run-verify.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/run-verify.c') diff --git a/tests/run-verify.c b/tests/run-verify.c index 3c18d3b6..ebc20d97 100644 --- a/tests/run-verify.c +++ b/tests/run-verify.c @@ -197,9 +197,12 @@ print_result (gpgme_verify_result_t result) ti->policy == GPGME_TOFU_POLICY_UNKNOWN? "unknown" : ti->policy == GPGME_TOFU_POLICY_BAD? "bad" : ti->policy == GPGME_TOFU_POLICY_ASK? "ask" : "?"); - printf (" sigcount : %hu\n", ti->signcount); - printf (" firstseen: %s\n", isotimestr (ti->firstseen)); - printf (" lastseen : %s\n", isotimestr (ti->lastseen)); + printf (" signcount: %hu\n", ti->signcount); + printf (" first..: %s\n", isotimestr (ti->signfirst)); + printf (" last ..: %s\n", isotimestr (ti->signlast)); + printf (" encrcount: %hu\n", ti->encrcount); + printf (" first..: %s\n", isotimestr (ti->encrfirst)); + printf (" last ..: %s\n", isotimestr (ti->encrlast)); printf (" desc ....: "); print_description (nonnull (ti->description), 15); } -- cgit v1.2.3