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 | |
| 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
| -rw-r--r-- | drivers/net/Kconfig | 1 | ||||
| -rw-r--r-- | fs/Kconfig | 2 | ||||
| -rw-r--r-- | net/ieee80211/Kconfig | 2 |
3 files changed, 5 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. |
diff --git a/fs/Kconfig b/fs/Kconfig index fee318e6f4bb..133dcc8a4150 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -1777,6 +1777,7 @@ config RPCSEC_GSS_KRB5 | |||
| 1777 | select CRYPTO | 1777 | select CRYPTO |
| 1778 | select CRYPTO_MD5 | 1778 | select CRYPTO_MD5 |
| 1779 | select CRYPTO_DES | 1779 | select CRYPTO_DES |
| 1780 | select CRYPTO_CBC | ||
| 1780 | help | 1781 | help |
| 1781 | Provides for secure RPC calls by means of a gss-api | 1782 | Provides for secure RPC calls by means of a gss-api |
| 1782 | mechanism based on Kerberos V5. This is required for | 1783 | mechanism based on Kerberos V5. This is required for |
| @@ -1795,6 +1796,7 @@ config RPCSEC_GSS_SPKM3 | |||
| 1795 | select CRYPTO_MD5 | 1796 | select CRYPTO_MD5 |
| 1796 | select CRYPTO_DES | 1797 | select CRYPTO_DES |
| 1797 | select CRYPTO_CAST5 | 1798 | select CRYPTO_CAST5 |
| 1799 | select CRYPTO_CBC | ||
| 1798 | help | 1800 | help |
| 1799 | Provides for secure RPC calls by means of a gss-api | 1801 | Provides for secure RPC calls by means of a gss-api |
| 1800 | mechanism based on the SPKM3 public-key mechanism. | 1802 | mechanism based on the SPKM3 public-key mechanism. |
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 |