aboutsummaryrefslogtreecommitdiffstats
path: root/doc/help.txt
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2016-08-31 12:17:13 +0000
committerNeal H. Walfield <[email protected]>2016-08-31 12:17:13 +0000
commitb69b2cb082e39a7eb56082fa80219f6f14fbd2b4 (patch)
treed5f3fd283398ec84ded904aa19c15a822be5f733 /doc/help.txt
parentg10: Always trust ultimately trusted keys. (diff)
downloadgnupg-b69b2cb082e39a7eb56082fa80219f6f14fbd2b4.tar.gz
gnupg-b69b2cb082e39a7eb56082fa80219f6f14fbd2b4.zip
doc: Add a help text for tofu.conflict.
* doc/help.txt (.gpg.tofu.conflict): New help text. -- Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to 'doc/help.txt')
-rw-r--r--doc/help.txt15
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/help.txt b/doc/help.txt
index e92cfbe05..4c6df7c3e 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -358,8 +358,19 @@ revocation certificate. Please keep this text concise.
An empty line ends the text.
.
-
-
+.gpg.tofu.conflict
+# tofu.c
+TOFU has detected another key with the same (or a very similar) email
+address. It might be that the user created a new key. In this case,
+you can safely trust the new key (but, confirm this by asking the
+person). However, it could also be that the key is a forgery or there
+is an active Man-in-the-Middle (MitM) attack. In this case, you
+should mark the key as being bad, so that it is untrusted. Marking a
+key as being untrusted means that any signatures will be considered
+bad and attempts to encrypt to the key will be flagged. If you are
+unsure and can't currently check, you should select either accept once
+or reject once.
+.
.gpgsm.root-cert-not-trusted
# This text gets displayed by the audit log if