mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-18 06:50:08 +00:00
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
This commit is contained in:
commit
8c8a0eab98
@ -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.
|
||||
|
@ -1777,6 +1777,7 @@ config RPCSEC_GSS_KRB5
|
||||
select CRYPTO
|
||||
select CRYPTO_MD5
|
||||
select CRYPTO_DES
|
||||
select CRYPTO_CBC
|
||||
help
|
||||
Provides for secure RPC calls by means of a gss-api
|
||||
mechanism based on Kerberos V5. This is required for
|
||||
@ -1795,6 +1796,7 @@ config RPCSEC_GSS_SPKM3
|
||||
select CRYPTO_MD5
|
||||
select CRYPTO_DES
|
||||
select CRYPTO_CAST5
|
||||
select CRYPTO_CBC
|
||||
help
|
||||
Provides for secure RPC calls by means of a gss-api
|
||||
mechanism based on the SPKM3 public-key mechanism.
|
||||
|
@ -32,6 +32,7 @@ config IEEE80211_CRYPT_WEP
|
||||
depends on IEEE80211
|
||||
select CRYPTO
|
||||
select CRYPTO_ARC4
|
||||
select CRYPTO_ECB
|
||||
select CRC32
|
||||
---help---
|
||||
Include software based cipher suites in support of IEEE
|
||||
@ -58,6 +59,7 @@ config IEEE80211_CRYPT_TKIP
|
||||
depends on IEEE80211 && NET_RADIO
|
||||
select CRYPTO
|
||||
select CRYPTO_MICHAEL_MIC
|
||||
select CRYPTO_ECB
|
||||
select CRC32
|
||||
---help---
|
||||
Include software based cipher suites in support of IEEE 802.11i
|
||||
|
Loading…
Reference in New Issue
Block a user