diff options
| author | Linus Torvalds | 2006-10-26 05:20:41 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-26 05:20:41 +0200 |
| commit | 8c8a0eab988c94294adbbb4fe955bba7d8ebddcf (patch) | |
| tree | 7af509b78594aeff7d6e076c806c84cc200686ed /drivers/net | |
| parent | Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/po... (diff) | |
| parent | [CRYPTO] users: Select ECB/CBC where needed (diff) | |
| download | kernel-qcow2-linux-8c8a0eab988c94294adbbb4fe955bba7d8ebddcf.tar.gz kernel-qcow2-linux-8c8a0eab988c94294adbbb4fe955bba7d8ebddcf.tar.xz kernel-qcow2-linux-8c8a0eab988c94294adbbb4fe955bba7d8ebddcf.zip | |
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 select CRYPTO select CRYPTO_SHA1 select CRYPTO_ARC4 + select CRYPTO_ECB ---help--- Support for the MPPE Encryption protocol, as employed by the Microsoft Point-to-Point Tunneling Protocol. |