EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

openssl: make engines support dynamically configurable (based on a patch by puchu)

Browse Source 
SVN-Revision: 19371
This commit is contained in:
Felix Fietkau 2010-01-28 19:28:06 +00:00
parent 0e84ed29ea
commit 1a4a9cea95
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/modules/crypto.mk
View File

@ -280,7 +280,7 @@ $(eval $(call KernelPackage,crypto-misc))
define KernelPackage/crypto-ocf define KernelPackage/crypto-ocf
$(call KernelPackage/crypto/Depends,@!TARGET_uml) $(call KernelPackage/crypto/Depends,@!TARGET_uml +@OPENSSL_ENGINE)
TITLE:=OCF modules TITLE:=OCF modules
KCONFIG:= \ KCONFIG:= \
CONFIG_OCF_OCF \ CONFIG_OCF_OCF \

9
package/openssl/Config.in Normal file
View File

@ -0,0 +1,9 @@
# OpenSSL configuration
if PACKAGE_libopenssl
config OPENSSL_ENGINE
bool
prompt "Crypto acceleration support"
endif

20
package/openssl/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssl PKG_NAME:=openssl
PKG_VERSION:=0.9.8l PKG_VERSION:=0.9.8l
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
@ -18,7 +18,8 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
PKG_MD5SUM:=05a0ece1372392a2cf310ebb96333025 PKG_MD5SUM:=05a0ece1372392a2cf310ebb96333025
PKG_BUILD_DEPENDS:=ocf-crypto-headers PKG_BUILD_DEPENDS := ocf-crypto-headers
PKG_CONFIG_DEPENDS := CONFIG_OPENSSL_ENGINE
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -27,6 +28,10 @@ define Package/openssl/Default
URL:=http://www.openssl.org/ URL:=http://www.openssl.org/
endef endef
define Package/libopenssl/config
source "$(SOURCE)/Config.in"
endef
define Package/openssl/Default/description define Package/openssl/Default/description
The OpenSSL Project is a collaborative effort to develop a robust, The OpenSSL Project is a collaborative effort to develop a robust,
commercial-grade, full-featured, and Open Source toolkit implementing the commercial-grade, full-featured, and Open Source toolkit implementing the
@ -69,13 +74,14 @@ endef
OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \ OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \
no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5
ifeq ($(BOARD),ixp4xx) OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2
OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \
no-sse2 --with-cryptodev ifdef CONFIG_OPENSSL_ENGINE
OPENSSL_OPTIONS += --with-cryptodev
else else
OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \ OPENSSL_OPTIONS += no-engines
no-engines no-sse2
endif endif
ifdef CONFIG_arm ifdef CONFIG_arm
OPENSSL_MAKEFLAGS := AES_ASM_OBJ="aes-armv4.o aes_cbc.o" OPENSSL_MAKEFLAGS := AES_ASM_OBJ="aes-armv4.o aes_cbc.o"
else else

3
package/ubsec_ssb/Makefile
View File

@ -10,6 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ubsec-ssb PKG_NAME:=ubsec-ssb
PKG_VERSION:=2009-02-21 PKG_VERSION:=2009-02-21
PKG_RELEASE:=1
CRYPTO_MENU:=OCF Configuration CRYPTO_MENU:=OCF Configuration
@ -17,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/ocf-ubsec-ssb define KernelPackage/ocf-ubsec-ssb
SUBMENU:=$(CRYPTO_MENU) SUBMENU:=$(CRYPTO_MENU)
DEPENDS:=@TARGET_brcm47xx +kmod-crypto-core +kmod-crypto-ocf DEPENDS:=@TARGET_brcm47xx +@OPENSSL_ENGINE +kmod-crypto-core +kmod-crypto-ocf
TITLE:=BCM5365P IPSec Core driver TITLE:=BCM5365P IPSec Core driver
FILES:=$(PKG_BUILD_DIR)/src/ubsec_ssb.$(LINUX_KMOD_SUFFIX) FILES:=$(PKG_BUILD_DIR)/src/ubsec_ssb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,09,ubsec_ssb) AUTOLOAD:=$(call AutoLoad,09,ubsec_ssb)