domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: remove kmod-crypto-aes, AES crypto support is always built into the kernel

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 46483
This commit is contained in:
Felix Fietkau
2015-07-24 15:36:08 +00:00
parent bc0f9ad8ca
commit 5b76e57dc2
4 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package/kernel/linux/modules/crypto.mk
View File

@@ -152,7 +152,7 @@ $(eval $(call KernelPackage,crypto-seqiv))
define KernelPackage/crypto-hw-talitos define KernelPackage/crypto-hw-talitos
TITLE:=Freescale integrated security engine (SEC) driver TITLE:=Freescale integrated security engine (SEC) driver
DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc DEPENDS:=+kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_DEV_TALITOS CONFIG_CRYPTO_DEV_TALITOS
FILES:= \ FILES:= \
@@ -166,7 +166,7 @@ $(eval $(call KernelPackage,crypto-hw-talitos))
define KernelPackage/crypto-hw-padlock define KernelPackage/crypto-hw-padlock
TITLE:=VIA PadLock ACE with AES/SHA hw crypto module TITLE:=VIA PadLock ACE with AES/SHA hw crypto module
DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager DEPENDS:=+kmod-crypto-manager
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_DEV_PADLOCK \ CONFIG_CRYPTO_DEV_PADLOCK \
CONFIG_CRYPTO_DEV_PADLOCK_AES \ CONFIG_CRYPTO_DEV_PADLOCK_AES \
@@ -254,24 +254,6 @@ endef
$(eval $(call KernelPackage,crypto-hw-omap)) $(eval $(call KernelPackage,crypto-hw-omap))
define KernelPackage/crypto-aes
TITLE:=AES cipher CryptoAPI module
KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586
FILES:=$(LINUX_DIR)/crypto/aes_generic.ko
AUTOLOAD:=$(call AutoLoad,09,aes_generic)
$(call AddDepends/crypto)
endef
ifndef CONFIG_TARGET_x86_64
define KernelPackage/crypto-aes/x86
FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.ko
AUTOLOAD:=$(call AutoLoad,09,aes-i586)
endef
endif
$(eval $(call KernelPackage,crypto-aes))
define KernelPackage/crypto-arc4 define KernelPackage/crypto-arc4
TITLE:=ARC4 (RC4) cipher CryptoAPI module TITLE:=ARC4 (RC4) cipher CryptoAPI module
KCONFIG:=CONFIG_CRYPTO_ARC4 KCONFIG:=CONFIG_CRYPTO_ARC4
@@ -645,7 +627,7 @@ $(eval $(call KernelPackage,crypto-xts))
define KernelPackage/crypto-mv-cesa define KernelPackage/crypto-mv-cesa
TITLE:=Marvell crypto engine TITLE:=Marvell crypto engine
DEPENDS:=+kmod-crypto-manager +kmod-crypto-aes @TARGET_kirkwood||TARGET_orion||TARGET_mvebu DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion||TARGET_mvebu
KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA
FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko
AUTOLOAD:=$(call AutoLoad,09,mv_cesa) AUTOLOAD:=$(call AutoLoad,09,mv_cesa)

4
package/kernel/mac80211/Makefile
View File

@@ -78,7 +78,7 @@ endef
define KernelPackage/mac80211 define KernelPackage/mac80211
$(call KernelPackage/mac80211/Default) $(call KernelPackage/mac80211/Default)
TITLE:=Linux 802.11 Wireless Networking Stack TITLE:=Linux 802.11 Wireless Networking Stack
DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211 +hostapd-common DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-cfg80211 +hostapd-common
KCONFIG:=\ KCONFIG:=\
CONFIG_AVERAGE=y CONFIG_AVERAGE=y
FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
@@ -698,7 +698,7 @@ endef
define KernelPackage/net-libipw define KernelPackage/net-libipw
$(call KernelPackage/mac80211/Default) $(call KernelPackage/mac80211/Default)
TITLE:=libipw for ipw2100 and ipw2200 TITLE:=libipw for ipw2100 and ipw2200
DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko
AUTOLOAD:=$(call AutoProbe,libipw) AUTOLOAD:=$(call AutoProbe,libipw)
endef endef

1
target/linux/x86/config-3.18
View File

@@ -77,6 +77,7 @@ CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_CPU_SUP_UMC_32=y CONFIG_CPU_SUP_UMC_32=y
CONFIG_CRC16=y CONFIG_CRC16=y
CONFIG_CRYPTO_AES_586=y
CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_CRC32_PCLMUL is not set # CONFIG_CRYPTO_CRC32_PCLMUL is not set
CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH=y

2
target/linux/x86/geode/target.mk
View File

@@ -1,7 +1,7 @@
BOARDNAME:=AMD Geode based systems BOARDNAME:=AMD Geode based systems
FEATURES:=squashfs ext4 pci usb gpio FEATURES:=squashfs ext4 pci usb gpio
DEFAULT_PACKAGES += \ DEFAULT_PACKAGES += \
kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-aes kmod-crypto-cbc \ kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-cbc \
kmod-ath5k kmod-ath9k \ kmod-ath5k kmod-ath9k \
kmod-button-hotplug \ kmod-button-hotplug \
kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \