Document the command line flag -o and provide --option as well.

[tinc] / doc / SECURITY2

diff --git a/doc/SECURITY2 b/doc/SECURITY2
index 4276a01..62d6a07 100644 (file)
--- a/doc/SECURITY2
+++ b/doc/SECURITY2
@@ -1,7 +1,7 @@
 This is the security documentation for tinc, a Virtual Private Network daemon.
 
 This is the security documentation for tinc, a Virtual Private Network daemon.
 

-   Copyright 2001-2002 Guus Sliepen <guus@sliepen.warande.net>,
-             2001-2002 Wessel Dankers <wsl@nl.linux.org>
+   Copyright 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+             2001-2006 Wessel Dankers <wsl@tinc-vpn.org>

 
    Permission is granted to make and distribute verbatim copies of
    this documentation provided the copyright notice and this
 
    Permission is granted to make and distribute verbatim copies of
    this documentation provided the copyright notice and this


@@ -12,8 +12,6 @@ This is the security 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.
 
    provided that the entire resulting derived work is distributed
    under the terms of a permission notice identical to this one.
 

-   $Id: SECURITY2,v 1.1.2.2 2002/02/10 21:57:51 guus Exp $
-

 Proposed new authentication scheme
 ----------------------------------
 
 Proposed new authentication scheme
 ----------------------------------
 


@@ -66,17 +64,15 @@ server  CHAL_REPLY 928ffe
 After the correct challenge replies are recieved, both ends have proved
 their identity. Further information is exchanged.
 
 After the correct challenge replies are recieved, both ends have proved
 their identity. Further information is exchanged.
 

-client  ACK 655 12.23.34.45 123 0
-             |       |       |  +-> options
-            |       |       +----> estimated weight
-            |       +------------> IP address of server as seen by client
-            +--------------------> UDP port of client
-
-server  ACK 655 21.32.43.54 321 0
-             |       |       |  +-> options
-            |       |       +----> estimated weight
-            |       +------------> IP address of client as seen by server
-            +--------------------> UDP port of server
+client  ACK 655 123 0
+             |   |  +-> options
+                |   +----> estimated weight
+                +--------> listening port of client
+
+server  ACK 655 321 0
+             |   |  +-> options
+                |   +----> estimated weight
+                +--------> listening port of server

 --------------------------------------------------------------------------
 
 This new scheme has several improvements, both in efficiency and security.
 --------------------------------------------------------------------------
 
 This new scheme has several improvements, both in efficiency and security.