a0181c
Index: options.pptp
a0181c
===================================================================
a0181c
RCS file: /cvsroot/pptpclient/pptp-linux/options.pptp,v
a0181c
retrieving revision 1.3
a0181c
diff -u -r1.3 options.pptp
a0181c
--- options.pptp	26 Mar 2006 23:11:05 -0000	1.3
a0181c
+++ options.pptp	30 Aug 2012 12:38:36 -0000
a0181c
@@ -33,17 +33,25 @@
a0181c
 
a0181c
 # Encryption
a0181c
 # (There have been multiple versions of PPP with encryption support,
a0181c
-# choose with of the following sections you will use.  Note that MPPE
a0181c
+# choose which of the following sections you will use.  Note that MPPE
a0181c
 # requires the use of MSCHAP-V2 during authentication)
a0181c
+#
a0181c
+# Note that using PPTP with MPPE and MSCHAP-V2 should be considered
a0181c
+# insecure:
a0181c
+# http://marc.info/?l=pptpclient-devel&m=134372640219039&w=2
a0181c
+# https://github.com/moxie0/chapcrack/blob/master/README.md
a0181c
+# http://technet.microsoft.com/en-us/security/advisory/2743314
a0181c
 
a0181c
 # http://ppp.samba.org/ the PPP project version of PPP by Paul Mackarras
a0181c
 # ppp-2.4.2 or later with MPPE only, kernel module ppp_mppe.o
a0181c
+# If the kernel is booted in FIPS mode (fips=1), the ppp_mppe.ko module
a0181c
+# is not allowed and PPTP-MPPE is not available.
a0181c
 # {{{
a0181c
 # Require MPPE 128-bit encryption
a0181c
 #require-mppe-128
a0181c
 # }}}
a0181c
 
a0181c
-# http://polbox.com/h/hs001/ fork from PPP project by Jan Dubiec
a0181c
+# http://mppe-mppc.alphacron.de/ fork from PPP project by Jan Dubiec
a0181c
 # ppp-2.4.2 or later with MPPE and MPPC, kernel module ppp_mppe_mppc.o
a0181c
 # {{{
a0181c
 # Require MPPE 128-bit encryption