2008-11-18 20:52:33 +00:00
|
|
|
#
|
openssl: update to 1.0.2g (8 CVEs)
CVE-2016-0704
s2_srvr.c overwrite the wrong bytes in the master-key when applying
Bleichenbacher protection for export cipher suites. This provides a
Bleichenbacher oracle, and could potentially allow more efficient variants of
the DROWN attack.
CVE-2016-0703
s2_srvr.c did not enforce that clear-key-length is 0 for non-export ciphers.
If clear-key bytes are present for these ciphers, they *displace* encrypted-key
bytes. This leads to an efficient divide-and-conquer key recovery attack: if
an eavesdropper has intercepted an SSLv2 handshake, they can use the server as
an oracle to determine the SSLv2 master-key, using only 16 connections to the
server and negligible computation. More importantly, this leads to a more
efficient version of DROWN that is effective against non-export ciphersuites,
and requires no significant computation.
CVE-2016-0702
A side-channel attack was found which makes use of cache-bank conflicts on
the Intel Sandy-Bridge microarchitecture which could lead to the recovery of
RSA keys. The ability to exploit this issue is limited as it relies on an
attacker who has control of code in a thread running on the same hyper-
threaded core as the victim thread which is performing decryptions.
CVE-2016-0799
The internal |fmtstr| function used in processing a "%s" format string in
the BIO_*printf functions could overflow while calculating the length of a
string and cause an OOB read when printing very long strings. Additionally
the internal |doapr_outch| function can attempt to write to an OOB memory
location (at an offset from the NULL pointer) in the event of a memory
allocation failure. In 1.0.2 and below this could be caused where the size
of a buffer to be allocated is greater than INT_MAX. E.g. this could be in
processing a very long "%s" format string. Memory leaks can also occur.
The first issue may mask the second issue dependent on compiler behaviour.
These problems could enable attacks where large amounts of untrusted data is
passed to the BIO_*printf functions. If applications use these functions in
this way then they could be vulnerable. OpenSSL itself uses these functions
when printing out human-readable dumps of ASN.1 data. Therefore applications
that print this data could be vulnerable if the data is from untrusted sources.
OpenSSL command line applications could also be vulnerable where they print out
ASN.1 data, or if untrusted data is passed as command line arguments. Libssl is
not considered directly vulnerable. Additionally certificates etc received via
remote connections via libssl are also unlikely to be able to trigger these
issues because of message size limits enforced within libssl.
CVE-2016-0797
In the BN_hex2bn function the number of hex digits is calculated using an int
value |i|. Later |bn_expand| is called with a value of |i * 4|. For large
values of |i| this can result in |bn_expand| not allocating any memory because
|i * 4| is negative. This can leave the internal BIGNUM data field as NULL
leading to a subsequent NULL ptr deref. For very large values of |i|, the
calculation |i * 4| could be a positive value smaller than |i|. In this case
memory is allocated to the internal BIGNUM data field, but it is insufficiently
sized leading to heap corruption. A similar issue exists in BN_dec2bn. This
could have security consequences if BN_hex2bn/BN_dec2bn is ever called by user
applications with very large untrusted hex/dec data. This is anticipated to be
a rare occurrence. All OpenSSL internal usage of these functions use data that
is not expected to be untrusted, e.g. config file data or application command
line arguments. If user developed applications generate config file data based
on untrusted data then it is possible that this could also lead to security
consequences. This is also anticipated to be rare.
CVE-2016-0798
The SRP user database lookup method SRP_VBASE_get_by_user had confusing memory
management semantics; the returned pointer was sometimes newly allocated, and
sometimes owned by the callee. The calling code has no way of distinguishing
these two cases. Specifically, SRP servers that configure a secret seed to hide
valid login information are vulnerable to a memory leak: an attacker connecting
with an invalid username can cause a memory leak of around 300 bytes per
connection. Servers that do not configure SRP, or configure SRP but do not
configure a seed are not vulnerable. In Apache, the seed directive is known as
SSLSRPUnknownUserSeed. To mitigate the memory leak, the seed handling in
SRP_VBASE_get_by_user is now disabled even if the user has configured a seed.
Applications are advised to migrate to SRP_VBASE_get1_by_user. However, note
that OpenSSL makes no strong guarantees about the indistinguishability of valid
and invalid logins. In particular, computations are currently not carried out
in constant time.
CVE-2016-0705
A double free bug was discovered when OpenSSL parses malformed DSA private keys
and could lead to a DoS attack or memory corruption for applications that
receive DSA private keys from untrusted sources. This scenario is considered
rare.
CVE-2016-0800
A cross-protocol attack was discovered that could lead to decryption of TLS
sessions by using a server supporting SSLv2 and EXPORT cipher suites as a
Bleichenbacher RSA padding oracle. Note that traffic between clients and non-
vulnerable servers can be decrypted provided another server supporting SSLv2
and EXPORT ciphers (even with a different protocol such as SMTP, IMAP or POP)
shares the RSA keys of the non-vulnerable server. This vulnerability is known
as DROWN (CVE-2016-0800). Recovering one session key requires the attacker to
perform approximately 2^50 computation, as well as thousands of connections to
the affected server. A more efficient variant of the DROWN attack exists
against unpatched OpenSSL servers using versions that predate 1.0.2a, 1.0.1m,
1.0.0r and 0.9.8zf released on 19/Mar/2015 (see CVE-2016-0703 below). Users can
avoid this issue by disabling the SSLv2 protocol in all their SSL/TLS servers,
if they've not done so already. Disabling all SSLv2 ciphers is also sufficient,
provided the patches for CVE-2015-3197 (fixed in OpenSSL 1.0.1r and 1.0.2f)
have been deployed. Servers that have not disabled the SSLv2 protocol, and are
not patched for CVE-2015-3197 are vulnerable to DROWN even if all SSLv2
ciphers are nominally disabled, because malicious clients can force the use of
SSLv2 with EXPORT ciphers. OpenSSL 1.0.2g and 1.0.1s deploy the following
mitigation against DROWN: SSLv2 is now by default disabled at build-time.
Builds that are not configured with "enable-ssl2" will not support SSLv2.
Even if "enable-ssl2" is used, users who want to negotiate SSLv2 via the
version-flexible SSLv23_method() will need to explicitly call either of:
SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv2); or SSL_clear_options(ssl,
SSL_OP_NO_SSLv2); as appropriate. Even if either of those is used, or the
application explicitly uses the version-specific SSLv2_method() or its client
or server variants, SSLv2 ciphers vulnerable to exhaustive search key recovery
have been removed. Specifically, the SSLv2 40-bit EXPORT ciphers, and SSLv2
56-bit DES are no longer available. In addition, weak ciphers in SSLv3 and up
are now disabled in default builds of OpenSSL. Builds that are not configured
with "enable-weak-ssl-ciphers" will not provide any "EXPORT" or "LOW" strength
ciphers.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 48868
2016-03-01 14:31:08 +00:00
|
|
|
# Copyright (C) 2006-2016 OpenWrt.org
|
2006-06-27 00:35:46 +00:00
|
|
|
#
|
|
|
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
|
|
|
# See /LICENSE for more information.
|
|
|
|
|
#
|
2006-06-11 00:41:05 +00:00
|
|
|
|
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
|
|
|
|
|
|
PKG_NAME:=openssl
|
2015-12-11 15:07:40 +00:00
|
|
|
PKG_BASE:=1.0.2
|
2017-07-24 23:17:56 +00:00
|
|
|
PKG_BUGFIX:=l
|
2015-12-11 15:07:40 +00:00
|
|
|
PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
|
openssl: Enable assembler optimizations for aarch64
OpenSSL is built with the generic linux settings for most targets,
including aarch64. These generic settings are designed for 32-bit CPU and
provide no assembler optmization: this is widely suboptimal for aarch64.
This patch simply switches to the aarch64 settings that are already
available in OpenSSL.
Here is the output of "openssl speed" before the optimization, with
"(...)" representing build flags that didn't change:
OpenSSL 1.0.2l 25 May 2017
options:bn(64,32) rc4(ptr,char) des(idx,cisc,2,int) aes(partial) blowfish(ptr)
compiler: aarch64-openwrt-linux-musl-gcc (...)
And after this patch, OpenSSL uses 64 bit mode and assembler optimizations:
OpenSSL 1.0.2l 25 May 2017
options:bn(64,64) rc4(ptr,char) des(idx,cisc,2,int) aes(partial) blowfish(ptr)
compiler: aarch64-openwrt-linux-musl-gcc (...) -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
Here are some benchmarks on a pine64+ running latest LEDE master r5142-20d363aed3:
before# openssl speed sha aes blowfish
The 'numbers' are in 1000s of bytes per second processed.
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 3918.89k 9982.43k 19148.03k 24933.03k 27325.78k
sha256 4604.51k 10240.64k 17472.51k 21355.18k 22801.07k
sha512 3662.19k 14539.41k 21443.16k 29544.11k 33177.60k
blowfish cbc 16266.63k 16940.86k 17176.92k 17237.33k 17252.35k
aes-128 cbc 19712.95k 21447.40k 22091.09k 22258.35k 22304.09k
aes-192 cbc 17680.12k 19064.47k 19572.14k 19703.13k 19737.26k
aes-256 cbc 15986.67k 17132.48k 17537.28k 17657.17k 17689.26k
after# openssl speed sha aes blowfish
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 6770.87k 26172.80k 86878.38k 205649.58k 345978.20k
sha256 20913.93k 74663.85k 184658.18k 290891.09k 351032.66k
sha512 7633.10k 30110.14k 50083.24k 71883.43k 82485.25k
blowfish cbc 16224.93k 16933.55k 17173.76k 17234.94k 17252.35k
aes-128 cbc 19425.74k 21193.31k 22065.74k 22304.77k 22380.54k
aes-192 cbc 17452.29k 18883.84k 19536.90k 19741.70k 19800.06k
aes-256 cbc 15815.89k 17003.01k 17530.03k 17695.40k 17746.60k
For some reason AES and blowfish do not benefit, but SHA performance
improves between 1.7x and 15x. SHA256 clearly benefits the most from the
optimization (4.5x on small blocks, 15x on large blocks!).
When using EVP (with "openssl speed -evp <algo>"):
# Before, EVP mode
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 3824.46k 10049.66k 19170.56k 24947.03k 27325.78k
sha256 3368.33k 8511.15k 16061.44k 20772.52k 22721.88k
sha512 2845.23k 11381.57k 19467.69k 28512.26k 33008.30k
bf-cbc 15146.74k 16623.83k 17092.01k 17211.39k 17249.62k
aes-128-cbc 17873.03k 20870.61k 21933.65k 22216.36k 22301.35k
aes-192-cbc 16184.18k 18607.15k 19447.13k 19670.02k 19737.26k
aes-256-cbc 14774.06k 16757.25k 17457.58k 17639.42k 17686.53k
# After, EVP mode
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 7056.97k 27142.10k 89515.86k 209155.41k 347419.99k
sha256 7745.70k 29750.06k 95341.48k 211001.69k 332376.75k
sha512 4550.47k 18086.06k 39997.10k 65880.75k 81431.21k
bf-cbc 15129.20k 16619.03k 17090.56k 17212.76k 17246.89k
aes-128-cbc 99619.74k 269032.34k 450214.23k 567353.00k 613933.06k
aes-192-cbc 93180.74k 231017.79k 361766.66k 433671.51k 461731.16k
aes-256-cbc 89343.23k 209858.58k 310160.04k 362234.88k 380878.85k
Blowfish does not seem to have assembler optimization at all, and SHA
still benefits (between 1.6x and 14.5x) but is generally slower than in
non-EVP mode.
However, AES performance is improved between 5.5x and 27.5x, which is
really impressive! For aes-128-cbc on large blocks, a core i7-6600U
@2.60GHz is only twice as fast...
Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
2017-10-27 18:45:53 +00:00
|
|
|
PKG_RELEASE:=2
|
2013-08-14 13:02:33 +00:00
|
|
|
PKG_USE_MIPS16:=0
|
2006-06-11 00:41:05 +00:00
|
|
|
|
2015-06-16 17:28:11 +00:00
|
|
|
PKG_BUILD_PARALLEL:=0
|
2013-09-10 12:09:13 +00:00
|
|
|
|
2016-09-26 19:56:14 +00:00
|
|
|
|
2006-09-23 13:59:21 +00:00
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
2017-03-22 06:31:20 +00:00
|
|
|
PKG_SOURCE_URL:= \
|
|
|
|
|
http://ftp.fi.muni.cz/pub/openssl/source/ \
|
|
|
|
|
http://ftp.linux.hr/pub/openssl/source/ \
|
|
|
|
|
http://gd.tuwien.ac.at/infosys/security/openssl/source/ \
|
|
|
|
|
http://www.openssl.org/source/ \
|
|
|
|
|
http://www.openssl.org/source/old/$(PKG_BASE)/
|
2017-07-24 23:17:56 +00:00
|
|
|
PKG_HASH:=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c
|
2006-06-11 00:41:05 +00:00
|
|
|
|
2014-11-02 12:20:54 +00:00
|
|
|
PKG_LICENSE:=OpenSSL
|
2012-10-19 15:34:28 +00:00
|
|
|
PKG_LICENSE_FILES:=LICENSE
|
2014-10-30 13:11:04 +00:00
|
|
|
PKG_CONFIG_DEPENDS:= \
|
|
|
|
|
CONFIG_OPENSSL_ENGINE_CRYPTO \
|
|
|
|
|
CONFIG_OPENSSL_ENGINE_DIGEST \
|
|
|
|
|
CONFIG_OPENSSL_WITH_EC \
|
|
|
|
|
CONFIG_OPENSSL_WITH_EC2M \
|
2015-12-09 22:26:40 +00:00
|
|
|
CONFIG_OPENSSL_WITH_SSL3 \
|
2016-05-19 11:52:45 +00:00
|
|
|
CONFIG_OPENSSL_HARDWARE_SUPPORT \
|
2016-05-19 13:59:55 +00:00
|
|
|
CONFIG_OPENSSL_WITH_DEPRECATED \
|
2016-09-26 20:00:04 +00:00
|
|
|
CONFIG_OPENSSL_WITH_DTLS \
|
2016-05-20 11:39:12 +00:00
|
|
|
CONFIG_OPENSSL_WITH_COMPRESSION \
|
2016-05-20 15:23:28 +00:00
|
|
|
CONFIG_OPENSSL_WITH_NPN \
|
2016-06-10 10:02:15 +00:00
|
|
|
CONFIG_OPENSSL_WITH_PSK \
|
|
|
|
|
CONFIG_OPENSSL_WITH_SRP
|
2008-11-18 20:52:33 +00:00
|
|
|
|
2006-06-21 02:32:39 +00:00
|
|
|
include $(INCLUDE_DIR)/package.mk
|
2006-06-11 00:41:05 +00:00
|
|
|
|
2014-10-20 11:19:53 +00:00
|
|
|
ifneq ($(CONFIG_CCACHE),)
|
|
|
|
|
HOSTCC=$(HOSTCC_NOCACHE)
|
|
|
|
|
HOSTCXX=$(HOSTCXX_NOCACHE)
|
|
|
|
|
endif
|
|
|
|
|
|
2006-09-23 13:59:21 +00:00
|
|
|
define Package/openssl/Default
|
|
|
|
|
TITLE:=Open source SSL toolkit
|
|
|
|
|
URL:=http://www.openssl.org/
|
|
|
|
|
endef
|
|
|
|
|
|
2010-01-28 19:28:06 +00:00
|
|
|
define Package/libopenssl/config
|
|
|
|
|
source "$(SOURCE)/Config.in"
|
|
|
|
|
endef
|
|
|
|
|
|
2007-09-07 08:34:51 +00:00
|
|
|
define Package/openssl/Default/description
|
2010-03-14 01:47:55 +00:00
|
|
|
The OpenSSL Project is a collaborative effort to develop a robust,
|
|
|
|
|
commercial-grade, full-featured, and Open Source toolkit implementing the Secure
|
|
|
|
|
Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well
|
|
|
|
|
as a full-strength general purpose cryptography library.
|
2007-09-07 08:34:51 +00:00
|
|
|
endef
|
|
|
|
|
|
2006-06-18 17:46:02 +00:00
|
|
|
define Package/libopenssl
|
2007-09-07 08:34:51 +00:00
|
|
|
$(call Package/openssl/Default)
|
2006-09-23 13:59:21 +00:00
|
|
|
SECTION:=libs
|
2009-05-26 15:04:50 +00:00
|
|
|
SUBMENU:=SSL
|
2006-09-23 13:59:21 +00:00
|
|
|
CATEGORY:=Libraries
|
2016-05-19 13:59:55 +00:00
|
|
|
DEPENDS:=+OPENSSL_WITH_COMPRESSION:zlib
|
2006-09-23 13:59:21 +00:00
|
|
|
TITLE+= (libraries)
|
2014-10-19 16:19:07 +00:00
|
|
|
ABI_VERSION:=$(PKG_VERSION)
|
2010-04-16 10:50:45 +00:00
|
|
|
MENU:=1
|
2007-09-07 08:34:51 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define Package/libopenssl/description
|
|
|
|
|
$(call Package/openssl/Default/description)
|
2010-03-14 01:47:55 +00:00
|
|
|
This package contains the OpenSSL shared libraries, needed by other programs.
|
2006-06-18 17:46:02 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define Package/openssl-util
|
2006-09-23 13:59:21 +00:00
|
|
|
$(call Package/openssl/Default)
|
|
|
|
|
SECTION:=utils
|
|
|
|
|
CATEGORY:=Utilities
|
2012-08-29 10:08:30 +00:00
|
|
|
DEPENDS:=+libopenssl
|
2006-09-23 13:59:21 +00:00
|
|
|
TITLE+= (utility)
|
2006-06-18 17:46:02 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define Package/openssl-util/conffiles
|
|
|
|
|
/etc/ssl/openssl.cnf
|
|
|
|
|
endef
|
|
|
|
|
|
2007-09-07 08:34:51 +00:00
|
|
|
define Package/openssl-util/description
|
|
|
|
|
$(call Package/openssl/Default/description)
|
2010-03-14 01:47:55 +00:00
|
|
|
This package contains the OpenSSL command-line utility.
|
2007-09-07 08:34:51 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
|
2016-05-20 13:34:02 +00:00
|
|
|
OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia no-krb5 \
|
2016-09-26 19:56:14 +00:00
|
|
|
no-whrlpool no-whirlpool no-seed no-jpake
|
2016-05-20 13:34:02 +00:00
|
|
|
OPENSSL_OPTIONS:= shared no-err no-sse2 no-ssl2 no-ssl2-method no-heartbeats
|
2010-01-28 19:28:06 +00:00
|
|
|
|
2012-07-11 23:38:16 +00:00
|
|
|
ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
|
2011-02-03 18:45:35 +00:00
|
|
|
OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
|
2012-07-11 23:38:16 +00:00
|
|
|
ifdef CONFIG_OPENSSL_ENGINE_DIGEST
|
|
|
|
|
OPENSSL_OPTIONS += -DUSE_CRYPTODEV_DIGESTS
|
|
|
|
|
endif
|
2008-07-12 15:42:00 +00:00
|
|
|
else
|
2010-01-28 19:28:06 +00:00
|
|
|
OPENSSL_OPTIONS += no-engines
|
2009-12-16 02:03:20 +00:00
|
|
|
endif
|
2010-01-28 19:28:06 +00:00
|
|
|
|
2013-07-24 12:37:55 +00:00
|
|
|
ifndef CONFIG_OPENSSL_WITH_EC
|
|
|
|
|
OPENSSL_OPTIONS += no-ec
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifndef CONFIG_OPENSSL_WITH_EC2M
|
|
|
|
|
OPENSSL_OPTIONS += no-ec2m
|
|
|
|
|
endif
|
|
|
|
|
|
2014-10-30 13:11:04 +00:00
|
|
|
ifndef CONFIG_OPENSSL_WITH_SSL3
|
2016-05-20 13:34:02 +00:00
|
|
|
OPENSSL_OPTIONS += no-ssl3 no-ssl3-method
|
2014-10-30 13:11:04 +00:00
|
|
|
endif
|
|
|
|
|
|
2015-12-09 22:26:40 +00:00
|
|
|
ifndef CONFIG_OPENSSL_HARDWARE_SUPPORT
|
|
|
|
|
OPENSSL_OPTIONS += no-hw
|
|
|
|
|
endif
|
|
|
|
|
|
2016-05-19 11:52:45 +00:00
|
|
|
ifndef CONFIG_OPENSSL_WITH_DEPRECATED
|
|
|
|
|
OPENSSL_OPTIONS += no-deprecated
|
|
|
|
|
endif
|
|
|
|
|
|
2016-09-26 20:00:04 +00:00
|
|
|
ifndef CONFIG_OPENSSL_WITH_DTLS
|
|
|
|
|
OPENSSL_OPTIONS += no-dtls
|
|
|
|
|
endif
|
|
|
|
|
|
2016-05-19 13:59:55 +00:00
|
|
|
ifdef CONFIG_OPENSSL_WITH_COMPRESSION
|
|
|
|
|
OPENSSL_OPTIONS += zlib-dynamic
|
|
|
|
|
else
|
|
|
|
|
OPENSSL_OPTIONS += no-comp
|
|
|
|
|
endif
|
|
|
|
|
|
2016-05-20 11:39:12 +00:00
|
|
|
ifndef CONFIG_OPENSSL_WITH_NPN
|
|
|
|
|
OPENSSL_OPTIONS += no-nextprotoneg
|
|
|
|
|
endif
|
|
|
|
|
|
2016-05-20 15:23:28 +00:00
|
|
|
ifndef CONFIG_OPENSSL_WITH_PSK
|
|
|
|
|
OPENSSL_OPTIONS += no-psk
|
|
|
|
|
endif
|
|
|
|
|
|
2016-06-10 10:02:15 +00:00
|
|
|
ifndef CONFIG_OPENSSL_WITH_SRP
|
|
|
|
|
OPENSSL_OPTIONS += no-srp
|
|
|
|
|
endif
|
|
|
|
|
|
2012-06-18 23:54:08 +00:00
|
|
|
ifeq ($(CONFIG_x86_64),y)
|
2016-04-15 05:40:31 +00:00
|
|
|
OPENSSL_TARGET:=linux-x86_64-openwrt
|
2014-03-12 10:00:53 +00:00
|
|
|
OPENSSL_MAKEFLAGS += LIBDIR=lib
|
2012-06-18 23:54:08 +00:00
|
|
|
else
|
2012-09-24 15:23:57 +00:00
|
|
|
OPENSSL_OPTIONS+=no-sse2
|
|
|
|
|
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
|
2016-04-15 05:40:31 +00:00
|
|
|
OPENSSL_TARGET:=linux-mips-openwrt
|
openssl: Enable assembler optimizations for aarch64
OpenSSL is built with the generic linux settings for most targets,
including aarch64. These generic settings are designed for 32-bit CPU and
provide no assembler optmization: this is widely suboptimal for aarch64.
This patch simply switches to the aarch64 settings that are already
available in OpenSSL.
Here is the output of "openssl speed" before the optimization, with
"(...)" representing build flags that didn't change:
OpenSSL 1.0.2l 25 May 2017
options:bn(64,32) rc4(ptr,char) des(idx,cisc,2,int) aes(partial) blowfish(ptr)
compiler: aarch64-openwrt-linux-musl-gcc (...)
And after this patch, OpenSSL uses 64 bit mode and assembler optimizations:
OpenSSL 1.0.2l 25 May 2017
options:bn(64,64) rc4(ptr,char) des(idx,cisc,2,int) aes(partial) blowfish(ptr)
compiler: aarch64-openwrt-linux-musl-gcc (...) -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
Here are some benchmarks on a pine64+ running latest LEDE master r5142-20d363aed3:
before# openssl speed sha aes blowfish
The 'numbers' are in 1000s of bytes per second processed.
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 3918.89k 9982.43k 19148.03k 24933.03k 27325.78k
sha256 4604.51k 10240.64k 17472.51k 21355.18k 22801.07k
sha512 3662.19k 14539.41k 21443.16k 29544.11k 33177.60k
blowfish cbc 16266.63k 16940.86k 17176.92k 17237.33k 17252.35k
aes-128 cbc 19712.95k 21447.40k 22091.09k 22258.35k 22304.09k
aes-192 cbc 17680.12k 19064.47k 19572.14k 19703.13k 19737.26k
aes-256 cbc 15986.67k 17132.48k 17537.28k 17657.17k 17689.26k
after# openssl speed sha aes blowfish
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 6770.87k 26172.80k 86878.38k 205649.58k 345978.20k
sha256 20913.93k 74663.85k 184658.18k 290891.09k 351032.66k
sha512 7633.10k 30110.14k 50083.24k 71883.43k 82485.25k
blowfish cbc 16224.93k 16933.55k 17173.76k 17234.94k 17252.35k
aes-128 cbc 19425.74k 21193.31k 22065.74k 22304.77k 22380.54k
aes-192 cbc 17452.29k 18883.84k 19536.90k 19741.70k 19800.06k
aes-256 cbc 15815.89k 17003.01k 17530.03k 17695.40k 17746.60k
For some reason AES and blowfish do not benefit, but SHA performance
improves between 1.7x and 15x. SHA256 clearly benefits the most from the
optimization (4.5x on small blocks, 15x on large blocks!).
When using EVP (with "openssl speed -evp <algo>"):
# Before, EVP mode
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 3824.46k 10049.66k 19170.56k 24947.03k 27325.78k
sha256 3368.33k 8511.15k 16061.44k 20772.52k 22721.88k
sha512 2845.23k 11381.57k 19467.69k 28512.26k 33008.30k
bf-cbc 15146.74k 16623.83k 17092.01k 17211.39k 17249.62k
aes-128-cbc 17873.03k 20870.61k 21933.65k 22216.36k 22301.35k
aes-192-cbc 16184.18k 18607.15k 19447.13k 19670.02k 19737.26k
aes-256-cbc 14774.06k 16757.25k 17457.58k 17639.42k 17686.53k
# After, EVP mode
type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
sha1 7056.97k 27142.10k 89515.86k 209155.41k 347419.99k
sha256 7745.70k 29750.06k 95341.48k 211001.69k 332376.75k
sha512 4550.47k 18086.06k 39997.10k 65880.75k 81431.21k
bf-cbc 15129.20k 16619.03k 17090.56k 17212.76k 17246.89k
aes-128-cbc 99619.74k 269032.34k 450214.23k 567353.00k 613933.06k
aes-192-cbc 93180.74k 231017.79k 361766.66k 433671.51k 461731.16k
aes-256-cbc 89343.23k 209858.58k 310160.04k 362234.88k 380878.85k
Blowfish does not seem to have assembler optimization at all, and SHA
still benefits (between 1.6x and 14.5x) but is generally slower than in
non-EVP mode.
However, AES performance is improved between 5.5x and 27.5x, which is
really impressive! For aes-128-cbc on large blocks, a core i7-6600U
@2.60GHz is only twice as fast...
Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
2017-10-27 18:45:53 +00:00
|
|
|
else ifeq ($(CONFIG_aarch64),y)
|
|
|
|
|
OPENSSL_TARGET:=linux-aarch64-openwrt
|
2016-08-31 11:31:38 +00:00
|
|
|
else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y)
|
|
|
|
|
OPENSSL_TARGET:=linux-armv4-openwrt
|
2012-09-24 15:23:57 +00:00
|
|
|
else
|
2016-04-15 05:40:31 +00:00
|
|
|
OPENSSL_TARGET:=linux-generic-openwrt
|
2012-09-24 15:23:57 +00:00
|
|
|
OPENSSL_OPTIONS+=no-perlasm
|
|
|
|
|
endif
|
2012-06-18 23:54:08 +00:00
|
|
|
endif
|
2006-09-23 13:59:21 +00:00
|
|
|
|
2017-03-01 18:48:32 +00:00
|
|
|
STAMP_CONFIGURED := $(STAMP_CONFIGURED)_$(shell echo $(OPENSSL_OPTIONS) | mkhash md5)
|
2014-03-09 13:19:29 +00:00
|
|
|
|
2006-06-11 00:41:05 +00:00
|
|
|
define Build/Configure
|
2014-03-09 13:19:29 +00:00
|
|
|
[ -f $(STAMP_CONFIGURED) ] || { \
|
|
|
|
|
rm -f $(PKG_BUILD_DIR)/*.so.* $(PKG_BUILD_DIR)/*.a; \
|
|
|
|
|
find $(PKG_BUILD_DIR) -name \*.o | xargs rm -f; \
|
|
|
|
|
}
|
2006-06-11 00:41:05 +00:00
|
|
|
(cd $(PKG_BUILD_DIR); \
|
2012-06-18 23:54:08 +00:00
|
|
|
./Configure $(OPENSSL_TARGET) \
|
2006-09-23 13:59:21 +00:00
|
|
|
--prefix=/usr \
|
|
|
|
|
--openssldir=/etc/ssl \
|
2007-09-03 05:00:38 +00:00
|
|
|
$(TARGET_CPPFLAGS) \
|
|
|
|
|
$(TARGET_LDFLAGS) -ldl \
|
2006-09-23 13:59:21 +00:00
|
|
|
-DOPENSSL_SMALL_FOOTPRINT \
|
|
|
|
|
$(OPENSSL_NO_CIPHERS) \
|
|
|
|
|
$(OPENSSL_OPTIONS) \
|
2006-06-11 00:41:05 +00:00
|
|
|
)
|
2009-05-17 00:25:41 +00:00
|
|
|
# XXX: OpenSSL "make depend" will look for installed headers before its own,
|
|
|
|
|
# so remove installed stuff first
|
|
|
|
|
-$(SUBMAKE) -j1 clean-staging
|
2013-09-10 12:09:13 +00:00
|
|
|
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
2006-08-31 21:18:29 +00:00
|
|
|
MAKEDEPPROG="$(TARGET_CROSS)gcc" \
|
2006-09-29 17:28:27 +00:00
|
|
|
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
|
2009-12-16 02:03:20 +00:00
|
|
|
$(OPENSSL_MAKEFLAGS) \
|
2006-06-11 00:41:05 +00:00
|
|
|
depend
|
2014-03-09 13:19:25 +00:00
|
|
|
endef
|
|
|
|
|
|
2016-06-02 11:43:14 +00:00
|
|
|
TARGET_CFLAGS += $(FPIC) -I$(CURDIR)/include -ffunction-sections -fdata-sections
|
|
|
|
|
TARGET_LDFLAGS += -Wl,--gc-sections
|
2014-03-09 13:19:25 +00:00
|
|
|
|
|
|
|
|
define Build/Compile
|
2013-09-10 12:09:13 +00:00
|
|
|
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
2010-03-14 01:47:55 +00:00
|
|
|
CC="$(TARGET_CC)" \
|
2015-03-06 07:57:10 +00:00
|
|
|
ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \
|
2010-03-14 01:47:55 +00:00
|
|
|
AR="$(TARGET_CROSS)ar r" \
|
|
|
|
|
RANLIB="$(TARGET_CROSS)ranlib" \
|
|
|
|
|
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
|
|
|
|
|
$(OPENSSL_MAKEFLAGS) \
|
|
|
|
|
all
|
2013-09-10 12:09:13 +00:00
|
|
|
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
2006-06-11 00:41:05 +00:00
|
|
|
CC="$(TARGET_CC)" \
|
2015-03-06 07:57:10 +00:00
|
|
|
ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \
|
2006-06-11 00:41:05 +00:00
|
|
|
AR="$(TARGET_CROSS)ar r" \
|
|
|
|
|
RANLIB="$(TARGET_CROSS)ranlib" \
|
2006-09-29 17:28:27 +00:00
|
|
|
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
|
2009-12-16 02:03:20 +00:00
|
|
|
$(OPENSSL_MAKEFLAGS) \
|
2010-03-14 01:47:55 +00:00
|
|
|
build-shared
|
2006-06-11 00:41:05 +00:00
|
|
|
# Work around openssl build bug to link libssl.so with libcrypto.so.
|
|
|
|
|
-rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
|
2013-09-10 12:09:13 +00:00
|
|
|
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
2006-08-04 03:26:32 +00:00
|
|
|
CC="$(TARGET_CC)" \
|
2006-09-29 17:28:27 +00:00
|
|
|
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
|
2009-12-16 02:03:20 +00:00
|
|
|
$(OPENSSL_MAKEFLAGS) \
|
2006-06-11 00:41:05 +00:00
|
|
|
do_linux-shared
|
2006-10-18 22:12:24 +00:00
|
|
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
2012-03-18 19:46:01 +00:00
|
|
|
CC="$(TARGET_CC)" \
|
2006-06-11 00:41:05 +00:00
|
|
|
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
|
2009-12-16 02:03:20 +00:00
|
|
|
$(OPENSSL_MAKEFLAGS) \
|
2006-06-11 00:41:05 +00:00
|
|
|
install
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define Build/InstallDev
|
2010-03-14 01:47:55 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/include
|
2007-09-28 01:45:11 +00:00
|
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/
|
2010-03-14 01:47:55 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/lib/
|
2007-09-28 01:45:11 +00:00
|
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/
|
2010-03-14 01:47:55 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
2007-09-28 01:45:11 +00:00
|
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/
|
2012-01-18 14:48:16 +00:00
|
|
|
[ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc || true
|
2006-06-11 00:41:05 +00:00
|
|
|
endef
|
2006-09-23 13:59:21 +00:00
|
|
|
|
2006-06-11 00:41:05 +00:00
|
|
|
define Package/libopenssl/install
|
2006-11-23 00:29:07 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
2009-06-29 20:48:58 +00:00
|
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcrypto.so.* $(1)/usr/lib/
|
|
|
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.* $(1)/usr/lib/
|
2006-06-11 00:41:05 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define Package/openssl-util/install
|
2006-11-23 00:29:07 +00:00
|
|
|
$(INSTALL_DIR) $(1)/etc/ssl
|
2006-06-11 00:41:05 +00:00
|
|
|
$(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/
|
2006-11-23 00:29:07 +00:00
|
|
|
$(INSTALL_DIR) $(1)/etc/ssl/certs
|
|
|
|
|
$(INSTALL_DIR) $(1)/etc/ssl/private
|
2006-06-11 00:41:05 +00:00
|
|
|
chmod 0700 $(1)/etc/ssl/private
|
2006-11-23 00:29:07 +00:00
|
|
|
$(INSTALL_DIR) $(1)/usr/bin
|
2007-12-09 18:53:06 +00:00
|
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
|
2006-06-11 00:41:05 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
$(eval $(call BuildPackage,libopenssl))
|
|
|
|
|
$(eval $(call BuildPackage,openssl-util))
|