diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-24 12:37:55 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-24 12:37:55 +0000 |
| commit | da654a0c4299ca9f35bf85a2e01e95d964edef0b (patch) | |
| tree | b3fd761e4acc8a85d5fb3203712e11254b7aab66 /package/libs | |
| parent | 1e8e6b46451acf4ebbf73a170173a3cd0de08f04 (diff) | |
| download | upstream-da654a0c4299ca9f35bf85a2e01e95d964edef0b.tar.gz upstream-da654a0c4299ca9f35bf85a2e01e95d964edef0b.tar.bz2 upstream-da654a0c4299ca9f35bf85a2e01e95d964edef0b.zip | |
openssl: add elliptic curve crypto compilation options to openssl
This patch adds EC compilation options to openssl
OPENSSL_WITH_EC is needed for authsae (OPENSSL_WITH_EC2M isn't)
Activating ec (but not ec2m) in openssl take 35Ko more on ar71xx (ipk size)
Activating both take 52Ko.
Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>
SVN-Revision: 37523
Diffstat (limited to 'package/libs')
| -rw-r--r-- | package/libs/openssl/Config.in | 9 | ||||
| -rw-r--r-- | package/libs/openssl/Makefile | 15 |
2 files changed, 21 insertions, 3 deletions
diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in index 70d520cd1c..b8a37793c7 100644 --- a/package/libs/openssl/Config.in +++ b/package/libs/openssl/Config.in @@ -1,6 +1,15 @@ menu "Configuration" depends on PACKAGE_libopenssl +config OPENSSL_WITH_EC + bool + prompt "Enable elliptic curve support" + +config OPENSSL_WITH_EC2M + bool + depends on OPENSSL_WITH_EC + prompt "Enable ec2m support" + config OPENSSL_ENGINE_CRYPTO bool prompt "Crypto acceleration support" diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 0091579985..8b0f5243bb 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_VERSION:=1.0.1e -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ @@ -20,7 +20,8 @@ PKG_MD5SUM:=66bf6f10f060d561929de96f9dfe5b8c PKG_LICENSE:=SSLEAY OPENSSL PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=ocf-crypto-headers -PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST +PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST \ + OPENSSL_WITH_EC OPENSSL_WITH_EC2M include $(INCLUDE_DIR)/package.mk @@ -75,7 +76,7 @@ endef 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 -OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2 +OPENSSL_OPTIONS:= shared no-err no-hw no-threads zlib-dynamic no-sse2 ifdef CONFIG_OPENSSL_ENGINE_CRYPTO OPENSSL_OPTIONS += -DHAVE_CRYPTODEV @@ -86,6 +87,14 @@ else OPENSSL_OPTIONS += no-engines endif +ifndef CONFIG_OPENSSL_WITH_EC + OPENSSL_OPTIONS += no-ec +endif + +ifndef CONFIG_OPENSSL_WITH_EC2M + OPENSSL_OPTIONS += no-ec2m +endif + ifeq ($(CONFIG_x86_64),y) OPENSSL_TARGET:=linux-x86_64 else |