[PATCH] gpg: Print ownertrust in TOFU+PGP trust model.

Damien Goutte-Gattat dgouttegattat at incenp.org
Mon Dec 14 09:31:08 CET 2015


* g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
--

The key editor currently prints out the ownertrust value assigned
to a key only when using the classic or PGP trust models; but
that value is also meaningful in the recently introduced TOFU+PGP
combined model.

Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>
---
 g10/keyedit.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 0a4766e..d958db8 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3233,9 +3233,10 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp,
                                opt.legacy_list_mode?
                                ((int) keystrlen () + 13):5, "");
 		  /* Ownertrust is only meaningful for the PGP or
-		     classic trust models */
+		     classic trust models, or PGP combined with TOFU */
 		  if (opt.trust_model == TM_PGP
-		      || opt.trust_model == TM_CLASSIC)
+		      || opt.trust_model == TM_CLASSIC
+		      || opt.trust_model == TM_TOFU_PGP)
 		    {
 		      int width = 14 - strlen (otrust);
 		      if (width <= 0)
-- 
1.8.4




More information about the Gnupg-devel mailing list