diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 23:20:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 23:20:41 -0400 |
| commit | 8c8a0eab988c94294adbbb4fe955bba7d8ebddcf (patch) | |
| tree | 7af509b78594aeff7d6e076c806c84cc200686ed /drivers/net | |
| parent | 8483ca3c99559027a3741af7f56f6b36887f7fd5 (diff) | |
| parent | bcbaecbb9968750d4bfb2686a97e396f681f88ef (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] users: Select ECB/CBC where needed
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e2ed24918a58..e38846eb51fa 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2717,6 +2717,7 @@ config PPP_MPPE | |||
| 2717 | select CRYPTO | 2717 | select CRYPTO |
| 2718 | select CRYPTO_SHA1 | 2718 | select CRYPTO_SHA1 |
| 2719 | select CRYPTO_ARC4 | 2719 | select CRYPTO_ARC4 |
| 2720 | select CRYPTO_ECB | ||
| 2720 | ---help--- | 2721 | ---help--- |
| 2721 | Support for the MPPE Encryption protocol, as employed by the | 2722 | Support for the MPPE Encryption protocol, as employed by the |
| 2722 | Microsoft Point-to-Point Tunneling Protocol. | 2723 | Microsoft Point-to-Point Tunneling Protocol. |