diff options
author | Matt Domsch <Matt_Domsch@dell.com> | 2005-11-08 12:40:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-08 12:40:47 -0500 |
commit | b3f9b92a6ec1a9a5e4b4b36e484f2f62cc73277c (patch) | |
tree | 7ca8e019573362620638e14e32bb519770ee6945 /drivers/net/Kconfig | |
parent | 6722e78c90054101e6797d5944cdc81af9897a0a (diff) |
[PPP]: add PPP MPPE encryption module
From: Matt Domsch <Matt_Domsch@dell.com>
The patch below implements the Microsoft Point-to-Point Encryption method
as a PPP compressor/decompressor. This is necessary for Linux clients and
servers to interoperate with Microsoft Point-to-Point Tunneling Protocol
(PPTP) servers (either Microsoft PPTP servers or the poptop project) which
use MPPE to encrypt data when creating a VPN.
This patch differs from the kernel_ppp_mppe DKMS pacakge at
pptpclient.sourceforge.net by utilizing the kernel crypto routines rather
than providing its own SHA1 and arcfour implementations.
Minor changes to ppp_generic.c try to prevent a link from disabling
compression (in our case, the encryption) after it has started using
compression (encryption).
Feedback to <pptpclient-devel@lists.sourceforge.net> please.
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Cc: James Cameron <james.cameron@hp.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1958d9e16a3a..24f1691b84f9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2523,6 +2523,19 @@ config PPP_BSDCOMP | |||
2523 | module; it is called bsd_comp and will show up in the directory | 2523 | module; it is called bsd_comp and will show up in the directory |
2524 | modules once you have said "make modules". If unsure, say N. | 2524 | modules once you have said "make modules". If unsure, say N. |
2525 | 2525 | ||
2526 | config PPP_MPPE | ||
2527 | tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)" | ||
2528 | depends on PPP && EXPERIMENTAL | ||
2529 | select CRYPTO | ||
2530 | select CRYPTO_SHA1 | ||
2531 | select CRYPTO_ARC4 | ||
2532 | ---help--- | ||
2533 | Support for the MPPE Encryption protocol, as employed by the | ||
2534 | Microsoft Point-to-Point Tunneling Protocol. | ||
2535 | |||
2536 | See http://pptpclient.sourceforge.net/ for information on | ||
2537 | configuring PPTP clients and servers to utilize this method. | ||
2538 | |||
2526 | config PPPOE | 2539 | config PPPOE |
2527 | tristate "PPP over Ethernet (EXPERIMENTAL)" | 2540 | tristate "PPP over Ethernet (EXPERIMENTAL)" |
2528 | depends on EXPERIMENTAL && PPP | 2541 | depends on EXPERIMENTAL && PPP |