From f5aa51aaacfe13ab9528aa9b88d8ce8eb61362fc Mon Sep 17 00:00:00 2001 From: Damien Goutte-Gattat Date: Mon, 14 Dec 2015 09:31:08 +0100 Subject: [PATCH] gpg: Print ownertrust in TOFU+PGP trust model. * 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 --- g10/keyedit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/g10/keyedit.c b/g10/keyedit.c index 0a4766e81..d958db8f3 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)