diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-11-24 09:35:25 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2017-11-24 22:18:37 +0100 |
commit | 01a95b2141e337dea15ad48e60a35c72a9b10205 (patch) | |
tree | 164abe9a5a42a2c8b3cbd1dcac4344caa0686752 /net | |
parent | Merge tag 'mac80211-for-davem-2017-11-20' of git://git.kernel.org/pub/scm/lin... (diff) | |
download | linux-01a95b2141e337dea15ad48e60a35c72a9b10205.tar.xz linux-01a95b2141e337dea15ad48e60a35c72a9b10205.zip |
cfg80211: select CRYPTO_SHA256 if needed
When regulatory database certificates are built-in, they're
currently using the SHA256 digest algorithm, so add that to
the build in that case.
Also add a note that for custom certificates, one may need
to add the right algorithms.
Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index da91bb547db3..1abcc4fc4df1 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -20,6 +20,10 @@ config CFG80211 tristate "cfg80211 - wireless configuration API" depends on RFKILL || !RFKILL select FW_LOADER + # may need to update this when certificates are changed and are + # using a different algorithm, though right now they shouldn't + # (this is here rather than below to allow it to be a module) + select CRYPTO_SHA256 if CFG80211_USE_KERNEL_REGDB_KEYS ---help--- cfg80211 is the Linux wireless LAN (802.11) configuration API. Enable this if you have a wireless device. @@ -113,6 +117,9 @@ config CFG80211_EXTRA_REGDB_KEYDIR certificates like in the kernel sources (net/wireless/certs/) that shall be accepted for a signed regulatory database. + Note that you need to also select the correct CRYPTO_<hash> modules + for your certificates, and if cfg80211 is built-in they also must be. + config CFG80211_REG_CELLULAR_HINTS bool "cfg80211 regulatory support for cellular base station hints" depends on CFG80211_CERTIFICATION_ONUS |