Prevent a MITM from forcing a NULL cipher for UDP (CVE-2018-16758)

[oweals/tinc.git] / doc / PROTOCOL

diff --git a/doc/PROTOCOL b/doc/PROTOCOL
index 795be8335859cbfe4caf380b642debbaa9a646e7..3ac958497f3aef9551f0f99c97e537f9464d5ae8 100644 (file)
--- a/doc/PROTOCOL
+++ b/doc/PROTOCOL
@@ -1,7 +1,7 @@
 This is the protocol documentation for tinc, a Virtual Private Network daemon.
 
-   Copyright 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
-             2000-2002 Ivo Timmmermans <ivo@o2w.nl>
+   Copyright 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+             2000-2005 Ivo Timmmermans
 
    Permission is granted to make and distribute verbatim copies of
    this documentation provided the copyright notice and this
@@ -12,9 +12,6 @@ This is the protocol documentation for tinc, a Virtual Private Network daemon.
    provided that the entire resulting derived work is distributed
    under the terms of a permission notice identical to this one.
 
-   $Id: PROTOCOL,v 1.1.2.8 2002/09/15 22:19:37 guus Exp $
-
-
 1.  Protocols used in tinc
 -------------------------
 
@@ -36,7 +33,7 @@ is pretty basic.
 A data packet can only be sent if the encryption key, cipher and digest are
 known to both parties, and the connection is activated. If the encryption key
 is not known, a request is sent to the destination using the meta connection to
-retreive it.
+retrieve it.
 
 0   1   2   3   4   5   6   7   ...   97  98  99  100
 |     seqno     |         data        |     MAC       |
@@ -62,7 +59,7 @@ daemon and to read and write requests by hand, provided that one
 understands the numeric codes sent.
 
 The authentication scheme is described in the SECURITY2 file. After a
-succesful authentication, the server and the client will exchange all the
+successful authentication, the server and the client will exchange all the
 information about other tinc daemons and subnets they know of, so that both
 sides (and all the other tinc daemons behind them) have their information
 synchronised.