--- gvpe/doc/gvpe.5	2004/06/11 15:56:12	1.1
+++ gvpe/doc/gvpe.5	2005/01/27 07:02:18	1.4
@@ -129,31 +129,31 @@
 .\" ========================================================================
 .\"
 .IX Title "GVPE 5"
-.TH GVPE 5 "2004-06-11" "1.7" "GNU Virtual Private Ethernet"
+.TH GVPE 5 "2005-01-27" "1.7" "GNU Virtual Private Ethernet"
 .SH "NAME"
 GNU\-VPE \- Overview of the GNU Virtual Private Ethernet suite.
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\s-1GVPE\s0 is a suite designed to provide a virtual private network for multiple
 nodes over an untrusted network.
-.PP
-\&\*(L"Virtual\*(R" means that no physical network is created (of course), but an
+.IP "\(bu" 4
+.IX Xref "Virtual"
+Virtual means that no physical network is created (of course), but an
 ethernet is emulated by creating multiple tunnels between the member
 nodes.
-.IX Xref "Virtual"
-.PP
-\&\*(L"Private\*(R" means that non-participating nodes cannot decode (\*(L"sniff)\*(R" nor
-inject (\*(L"spoof\*(R") packets.
+.IP "\(bu" 4
 .IX Xref "Private"
-.PP
+Private means that non-participating nodes cannot decode (\*(L"sniff)\*(R" nor
+inject (\*(L"spoof\*(R") packets.
+.Sp
 In the case of gvpe, even participating nodes cannot sniff packets send to
 other nodes or spoof packets as if sent from other nodes.
-.PP
-\&\*(L"Network\*(R" means that more than two parties can participate in the
-network, so for instance it's possible to connect multiple branches of a
-company into a single network. Many so-called \*(L"vpn\*(R" solutions only create
-point-to-point tunnels.
+.IP "\(bu" 4
 .IX Xref "Network"
+Network means that more than two parties can participate in the network,
+so for instance it's possible to connect multiple branches of a company
+into a single network. Many so-called \*(L"vpn\*(R" solutions only create
+point-to-point tunnels.
 .Sh "\s-1DESIGN\s0 \s-1GOALS\s0"
 .IX Subsection "DESIGN GOALS"
 .IP "\s-1SIMPLE\s0 \s-1DESIGN\s0" 4
@@ -191,22 +191,27 @@
 Please have a look at the \f(CW\*(C`gvpe.osdep(5)\*(C'\fR manpage for platform-specific
 information.
 .PP
-Here are a few recipes for compiling your gvpe:
+Here are a few recipes for compiling your gvpe, showing the extremes
+(fast, small, insecure \s-1OR\s0 slow, large, more secure), between you should
+choose:
 .Sh "\s-1AS\s0 \s-1LOW\s0 \s-1PACKET\s0 \s-1OVERHEAD\s0 \s-1AS\s0 \s-1POSSIBLE\s0"
 .IX Subsection "AS LOW PACKET OVERHEAD AS POSSIBLE"
 .Vb 1
 \&   ./configure --enable-hmac-length=4 --enable-rand-length=0
 .Ve
 .PP
-Minimize the header overhead of \s-1VPN\s0 packets (the above will result in only
-4 bytes of overhead over the raw ethernet frame).
+Minimize the header overhead of \s-1VPN\s0 packets (the above will result in
+only 4 bytes of overhead over the raw ethernet frame). This is a insecure
+configuration because a \s-1HMAC\s0 length of 4 makes collision attacks based on
+the birthday paradox easy, though.
 .Sh "\s-1MINIMIZE\s0 \s-1CPU\s0 \s-1TIME\s0 \s-1REQUIRED\s0"
 .IX Subsection "MINIMIZE CPU TIME REQUIRED"
 .Vb 1
 \&   ./configure --enable-cipher=bf --enable-digest=md4
 .Ve
 .PP
-Use the fastest cipher and digest algorithms currently available in gvpe.
+Use the fastest cipher and digest algorithms currently available in
+gvpe. \s-1MD4\s0 has been broken and is quite insecure, though.
 .Sh "\s-1MAXIMIZE\s0 \s-1SECURITY\s0"
 .IX Subsection "MAXIMIZE SECURITY"
 .Vb 1
@@ -215,7 +220,9 @@
 .PP
 This uses a 16 byte \s-1HMAC\s0 checksum to authenticate packets (I guess 8\-12
 would also be pretty secure ;) and will additionally prefix each packet
-with 8 bytes of random data.
+with 8 bytes of random data. In the long run, people should move to
+\&\s-1SHA\-224\s0 and beyond, but support in openssl is missing as of writing this
+document.
 .PP
 In general, remember that \s-1AES\-128\s0 seems to be more secure and faster than
 \&\s-1AES\-192\s0 or \s-1AES\-256\s0, more randomness helps against sniffing and a longer