aboutsummaryrefslogtreecommitdiff
path: root/doc/design/assistant/xmpp_security.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-13 13:08:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-13 13:08:58 -0400
commitf69a115326880ca632f347ced426ce32125c9ddd (patch)
tree8cea54dd400c61ab4a9a34976a0762ef4bb9f631 /doc/design/assistant/xmpp_security.mdwn
parent37996aeeb710f0b3b27b569eb884e697476c68f3 (diff)
add telehash design page; update roadmap
Diffstat (limited to 'doc/design/assistant/xmpp_security.mdwn')
-rw-r--r--doc/design/assistant/xmpp_security.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/design/assistant/xmpp_security.mdwn b/doc/design/assistant/xmpp_security.mdwn
index 6b2b728f2..a5bd84e04 100644
--- a/doc/design/assistant/xmpp_security.mdwn
+++ b/doc/design/assistant/xmpp_security.mdwn
@@ -24,3 +24,6 @@ AES encryption:
* Rely on the user's gpg key, and do gpg key verification during XMPP
pairing. Problimatic because who wants to put their gpg key on their
phone? Also, require the users be in the WOT and be gpg literate.
+
+Update: This seems unlikely to be worth doing. [[Telehash]] is better.
+--[[Joey]]