X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=README.MPPE;h=1d62efd16cc13f6244a1b138f52ac8f06b3f5c8a;hp=7091d0344bd1c11e6c86e13028ee9185b737cdb8;hb=d16a3985eade5280b8e171f5dd0670a91cba0d39;hpb=506314b474820d2f073cd79d5eb578eb96abeff1

diff --git a/README.MPPE b/README.MPPE
index 7091d03..1d62efd 100644
--- a/README.MPPE
+++ b/README.MPPE
@@ -4,6 +4,8 @@ PPP Support for MPPE (Microsoft Point to Point Encryption)
 Frank Cusack		frank@google.com
 Mar 19, 2002
 
+Updated by Paul Mackerras, Sep 2008
+
 
 DISCUSSION
 
@@ -58,14 +60,10 @@ RADIUS support for MPPE is from Ralf Hofmann, <ralf.hofmann@elvido.net>.
 
 BUILDING THE PPPD
 
-The userland component of PPPD has no additional requirements above those
-for MS-CHAP and MS-CHAPv2.  The kernel, however, requires SHA-1 and ARCFOUR.
-Public domain implementations of these are provided.  Until such time as
-MPPE support ships with kernels, you can use the Linux-2.2 implementation
-that comes with PPPD.  Run the linux/mppe/mppeinstall.sh script, then
-rebuild your kernel.  The ppp_mppe.o module is added, and the ppp.o module
-is modified (unfortunately).  You'll need the new ppp.o since it does the
-right thing for the 4 extra bytes problem discussed above.
+The userland component of PPPD has no additional requirements above
+those for MS-CHAP and MS-CHAPv2.
+
+MPPE support is now included in the mainline Linux kernel releases.
 
 
 CONFIGURATION
@@ -75,7 +73,6 @@ than 2.4.15, you will need to add
 
     alias ppp-compress-18 ppp_mppe
 
-to /etc/modules.conf.  (A patch for earlier versions of modutils is included
-with the kernel patches.)
+to /etc/modules.conf.