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 /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 'net')
| -rw-r--r-- | net/ieee80211/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index f7e84e9d13ad..a64be6cdf078 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig | |||
| @@ -32,6 +32,7 @@ config IEEE80211_CRYPT_WEP | |||
| 32 | depends on IEEE80211 | 32 | depends on IEEE80211 |
| 33 | select CRYPTO | 33 | select CRYPTO |
| 34 | select CRYPTO_ARC4 | 34 | select CRYPTO_ARC4 |
| 35 | select CRYPTO_ECB | ||
| 35 | select CRC32 | 36 | select CRC32 |
| 36 | ---help--- | 37 | ---help--- |
| 37 | Include software based cipher suites in support of IEEE | 38 | Include software based cipher suites in support of IEEE |
| @@ -58,6 +59,7 @@ config IEEE80211_CRYPT_TKIP | |||
| 58 | depends on IEEE80211 && NET_RADIO | 59 | depends on IEEE80211 && NET_RADIO |
| 59 | select CRYPTO | 60 | select CRYPTO |
| 60 | select CRYPTO_MICHAEL_MIC | 61 | select CRYPTO_MICHAEL_MIC |
| 62 | select CRYPTO_ECB | ||
| 61 | select CRC32 | 63 | select CRC32 |
| 62 | ---help--- | 64 | ---help--- |
| 63 | Include software based cipher suites in support of IEEE 802.11i | 65 | Include software based cipher suites in support of IEEE 802.11i |