summaryrefslogtreecommitdiff
path: root/doc/design/assistant/xmpp_security.mdwn
diff options
context:
space:
mode:
authorGravatar Øyvind A. Holm <sunny@sunbase.org>2015-04-02 01:50:17 +0200
committerGravatar Øyvind A. Holm <sunny@sunbase.org>2015-04-02 01:50:17 +0200
commit3b17aaba7f4d17ce9592aca965f319157494cbcd (patch)
tree32d5c5e299627587afb7a604d3eee6d6c06a3f31 /doc/design/assistant/xmpp_security.mdwn
parent716e69527522afaa3f5b5a836f4f878d4a374b01 (diff)
Various typo fixes in doc/*.mdwn
Diffstat (limited to 'doc/design/assistant/xmpp_security.mdwn')
-rw-r--r--doc/design/assistant/xmpp_security.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/design/assistant/xmpp_security.mdwn b/doc/design/assistant/xmpp_security.mdwn
index a5bd84e04..647bffd79 100644
--- a/doc/design/assistant/xmpp_security.mdwn
+++ b/doc/design/assistant/xmpp_security.mdwn
@@ -18,11 +18,11 @@ AES encryption:
use SPEKE (or similar methods like J-PAKE) to generate a shared key.
Avoids active MITM attacks. Makes pairing harder, especially pairing
between one's own devices, since the passphrase has to be entered on
- all devices. Also problimatic when pairing more than 2 devices,
+ all devices. Also problematic when pairing more than 2 devices,
especially when adding a device to the set later, since there
would then be multiple different keys in use.
* 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
+ pairing. Problematic 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.