projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openssl: optimize build options, disable old SSL versions
[openwrt/openwrt.git]
/
package
/
libs
/
openssl
/
Makefile
diff --git
a/package/libs/openssl/Makefile
b/package/libs/openssl/Makefile
index 7ee44408d249f6a976a95b6cb7fe428c6312c4e4..0130cb17e57ac2c150d15a97d9863a72b716e061 100644
(file)
--- a/
package/libs/openssl/Makefile
+++ b/
package/libs/openssl/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-201
2
OpenWrt.org
+# Copyright (C) 2006-201
4
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-8,23
+8,35
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
-PKG_VERSION:=1.0.1c
-PKG_RELEASE:=1
+PKG_VERSION:=1.0.1j
+PKG_RELEASE:=2
+PKG_USE_MIPS16:=0
+
+PKG_BUILD_PARALLEL:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \
- ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
- ftp://ftp.webmonster.de/pub/openssl/source/ \
+ ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.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:=
ae412727c8c15b67880aef7bd2999b2e
+PKG_MD5SUM:=
f7175c9cd3c39bb1907ac8bba9df8ed3
PKG_LICENSE:=SSLEAY OPENSSL
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=ocf-crypto-headers
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 \
+ CONFIG_OPENSSL_WITH_EC \
+ CONFIG_OPENSSL_WITH_EC2M \
+ CONFIG_OPENSSL_WITH_SSL3
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
+ifneq ($(CONFIG_CCACHE),)
+HOSTCC=$(HOSTCC_NOCACHE)
+HOSTCXX=$(HOSTCXX_NOCACHE)
+endif
+
define Package/openssl/Default
TITLE:=Open source SSL toolkit
URL:=http://www.openssl.org/
define Package/openssl/Default
TITLE:=Open source SSL toolkit
URL:=http://www.openssl.org/
@@
-48,6
+60,7
@@
$(call Package/openssl/Default)
CATEGORY:=Libraries
DEPENDS:=+zlib
TITLE+= (libraries)
CATEGORY:=Libraries
DEPENDS:=+zlib
TITLE+= (libraries)
+ ABI_VERSION:=$(PKG_VERSION)
MENU:=1
endef
MENU:=1
endef
@@
-74,9
+87,8
@@
This package contains the OpenSSL command-line utility.
endef
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_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia no-krb5
+OPENSSL_OPTIONS:= shared no-err no-hw zlib-dynamic no-sse2 no-ssl2 no-cms
ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
@@
-87,8
+99,21
@@
else
OPENSSL_OPTIONS += no-engines
endif
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
+
+ifndef CONFIG_OPENSSL_WITH_SSL3
+ OPENSSL_OPTIONS += no-ssl3
+endif
+
ifeq ($(CONFIG_x86_64),y)
ifeq ($(CONFIG_x86_64),y)
- OPENSSL_TARGET:=linux-x86_64
+ OPENSSL_TARGET:=linux-x86_64-openwrt
+ OPENSSL_MAKEFLAGS += LIBDIR=lib
else
OPENSSL_OPTIONS+=no-sse2
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
else
OPENSSL_OPTIONS+=no-sse2
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
@@
-99,7
+124,13
@@
else
endif
endif
endif
endif
+STAMP_CONFIGURED := $(STAMP_CONFIGURED)_$(subst $(space),_,$(OPENSSL_OPTIONS))
+
define Build/Configure
define Build/Configure
+ [ -f $(STAMP_CONFIGURED) ] || { \
+ rm -f $(PKG_BUILD_DIR)/*.so.* $(PKG_BUILD_DIR)/*.a; \
+ find $(PKG_BUILD_DIR) -name \*.o | xargs rm -f; \
+ }
(cd $(PKG_BUILD_DIR); \
./Configure $(OPENSSL_TARGET) \
--prefix=/usr \
(cd $(PKG_BUILD_DIR); \
./Configure $(OPENSSL_TARGET) \
--prefix=/usr \
@@
-110,28
+141,30
@@
define Build/Configure
$(OPENSSL_NO_CIPHERS) \
$(OPENSSL_OPTIONS) \
)
$(OPENSSL_NO_CIPHERS) \
$(OPENSSL_OPTIONS) \
)
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
# XXX: OpenSSL "make depend" will look for installed headers before its own,
# so remove installed stuff first
-$(SUBMAKE) -j1 clean-staging
# XXX: OpenSSL "make depend" will look for installed headers before its own,
# so remove installed stuff first
-$(SUBMAKE) -j1 clean-staging
-
$(MAKE
) -C $(PKG_BUILD_DIR) \
+
+$(MAKE) $(PKG_JOBS
) -C $(PKG_BUILD_DIR) \
MAKEDEPPROG="$(TARGET_CROSS)gcc" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
$(OPENSSL_MAKEFLAGS) \
depend
MAKEDEPPROG="$(TARGET_CROSS)gcc" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
$(OPENSSL_MAKEFLAGS) \
depend
- $(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR) \
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CC="$(TARGET_CC)" \
+ ASFLAGS="$(TARGET_ASFLAGS) -c" \
AR="$(TARGET_CROSS)ar r" \
RANLIB="$(TARGET_CROSS)ranlib" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
$(OPENSSL_MAKEFLAGS) \
all
AR="$(TARGET_CROSS)ar r" \
RANLIB="$(TARGET_CROSS)ranlib" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
$(OPENSSL_MAKEFLAGS) \
all
-
$(MAKE
) -C $(PKG_BUILD_DIR) \
+
+$(MAKE) $(PKG_JOBS
) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CC="$(TARGET_CC)" \
+ ASFLAGS="$(TARGET_ASFLAGS) -c" \
AR="$(TARGET_CROSS)ar r" \
RANLIB="$(TARGET_CROSS)ranlib" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
AR="$(TARGET_CROSS)ar r" \
RANLIB="$(TARGET_CROSS)ranlib" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
@@
-139,7
+172,7
@@
define Build/Compile
build-shared
# Work around openssl build bug to link libssl.so with libcrypto.so.
-rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
build-shared
# Work around openssl build bug to link libssl.so with libcrypto.so.
-rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
-
$(MAKE
) -C $(PKG_BUILD_DIR) \
+
+$(MAKE) $(PKG_JOBS
) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
$(OPENSSL_MAKEFLAGS) \
CC="$(TARGET_CC)" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
$(OPENSSL_MAKEFLAGS) \