From 7a221c7fce389e4561565c36d0a108373507faf1 Mon Sep 17 00:00:00 2001 From: Alexandros Couloumbis Date: Fri, 31 Aug 2018 10:51:25 +0300 Subject: [PATCH] kernel/mac80211: remove old-crypto code from lib80211. remove crypto from hostap-driver. --- .../patches/050-lib80211_option.patch | 48 +++++++++++++++++-- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/package/kernel/mac80211/patches/050-lib80211_option.patch b/package/kernel/mac80211/patches/050-lib80211_option.patch index 28a0d905b7..8c4138f65a 100644 --- a/package/kernel/mac80211/patches/050-lib80211_option.patch +++ b/package/kernel/mac80211/patches/050-lib80211_option.patch @@ -1,6 +1,6 @@ --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig -@@ -181,7 +181,7 @@ config CFG80211_WEXT_EXPORT +@@ -174,7 +174,7 @@ config CFG80211_WEXT_EXPORT wext compatibility symbols to be exported. config LIB80211 @@ -9,22 +9,60 @@ depends on m default n help -@@ -191,15 +191,15 @@ config LIB80211 +@@ -184,16 +184,19 @@ config LIB80211 Drivers should select this themselves if needed. config LIB80211_CRYPT_WEP - tristate +- depends on m + tristate "lib80211 WEP support" - depends on m ++ depends on LIB80211 ++ default n config LIB80211_CRYPT_CCMP - tristate +- depends on m + tristate "lib80211 CCMP support" - depends on m ++ depends on LIB80211 ++ default n config LIB80211_CRYPT_TKIP - tristate +- depends on m + tristate "lib80211 TKIP support" - depends on m ++ depends on LIB80211 ++ default n config LIB80211_DEBUG + bool "lib80211 debugging messages" +--- a/drivers/net/wireless/intersil/hostap/Kconfig ++++ b/drivers/net/wireless/intersil/hostap/Kconfig +@@ -6,17 +6,8 @@ config HOSTAP + depends on WIRELESS_EXT + depends on WEXT_SPY + depends on WEXT_PRIV +- depends on CRYPTO +- depends on CRYPTO_ARC4 +- depends on CRYPTO_ECB +- depends on CRYPTO_AES +- depends on CRYPTO_MICHAEL_MIC +- depends on CRYPTO_ECB + depends on CRC32 + select LIB80211 +- select LIB80211_CRYPT_WEP +- select LIB80211_CRYPT_TKIP +- select LIB80211_CRYPT_CCMP + ---help--- + Shared driver code for IEEE 802.11b wireless cards based on + Intersil Prism2/2.5/3 chipset. This driver supports so called +--- a/compat/Kconfig ++++ b/compat/Kconfig +@@ -107,8 +107,6 @@ config BPAUTO_CRYPTO_SKCIPHER + tristate + depends on m + depends on KERNEL_4_3 +- default y if BACKPORTED_LIB80211_CRYPT_WEP +- default y if BACKPORTED_LIB80211_CRYPT_TKIP + default y if BACKPORTED_BT + #c-file crypto/skcipher.c + #module-name skcipher -- 2.35.1