hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mbedtls: update to 2.16.3 

Remove 300-bn_mul.h-Use-optimized-MULADDC-code-only-on-ARM-6.patch,
the issue has been fixed upstream.

Signed-off-by: Magnus Kroken <mkroken@gmail.com>
(cherry picked from commit 49d96ffc5c)
openwrt-18.06
Magnus Kroken 2019-09-18 21:22:16 +02:00 committed by Hauke Mehrtens
parent 2698157d54
commit a63edb4691
4 changed files with 35 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/libs/mbedtls/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
PKG_VERSION:=2.16.2
PKG_VERSION:=2.16.3
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://tls.mbed.org/download/
PKG_HASH:=40d18965dd36ce0158a2b037c8c54401bad54f683f4311502518ee1a1a0b622c
PKG_HASH:=fd01fe4b289116df7781d05e1ef712b6c98823c5334f4a27404f13a8d066ef6a
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0+

60
package/libs/mbedtls/patches/200-config.patch
View File

@ -1,6 +1,6 @@
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -599,14 +599,14 @@
@@ -633,14 +633,14 @@
*
* Enable Output Feedback mode (OFB) for symmetric ciphers.
*/
@ -17,7 +17,7 @@
/**
* \def MBEDTLS_CIPHER_NULL_CIPHER
@@ -716,19 +716,19 @@
@@ -750,19 +750,19 @@
*
* Comment macros to disable the curve and functions for it
*/
@ -46,7 +46,7 @@
/**
* \def MBEDTLS_ECP_NIST_OPTIM
@@ -777,7 +777,7 @@
@@ -811,7 +811,7 @@
*
* Comment this macro to disable deterministic ECDSA.
*/
@ -55,7 +55,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
@@ -830,7 +830,7 @@
@@ -864,7 +864,7 @@
* See dhm.h for more details.
*
*/
@ -64,7 +64,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
@@ -850,7 +850,7 @@
@@ -884,7 +884,7 @@
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
*/
@ -73,7 +73,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
@@ -875,7 +875,7 @@
@@ -909,7 +909,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
@ -82,7 +82,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
@@ -1009,7 +1009,7 @@
@@ -1043,7 +1043,7 @@
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
*/
@ -91,7 +91,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
@@ -1033,7 +1033,7 @@
@@ -1067,7 +1067,7 @@
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
@ -100,7 +100,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
@@ -1137,7 +1137,7 @@
@@ -1171,7 +1171,7 @@
* This option is only useful if both MBEDTLS_SHA256_C and
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
*/
@ -109,7 +109,7 @@
/**
* \def MBEDTLS_ENTROPY_NV_SEED
@@ -1232,14 +1232,14 @@
@@ -1266,14 +1266,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
@ -126,7 +126,7 @@
/**
* \def MBEDTLS_SHA256_SMALLER
@@ -1255,7 +1255,7 @@
@@ -1289,7 +1289,7 @@
*
* Uncomment to enable the smaller implementation of SHA256.
*/
@ -135,7 +135,7 @@
/**
* \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
@@ -1393,7 +1393,7 @@
@@ -1427,7 +1427,7 @@
* configuration of this extension).
*
*/
@ -144,7 +144,7 @@
/**
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
@@ -1568,7 +1568,7 @@
@@ -1602,7 +1602,7 @@
*
* Comment this macro to disable support for SSL session tickets
*/
@ -153,7 +153,7 @@
/**
* \def MBEDTLS_SSL_EXPORT_KEYS
@@ -1598,7 +1598,7 @@
@@ -1632,7 +1632,7 @@
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
@ -162,7 +162,7 @@
/**
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
@@ -1657,7 +1657,7 @@
@@ -1691,7 +1691,7 @@
*
* Comment this to disable run-time checking and save ROM space
*/
@ -171,7 +171,7 @@
/**
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
@@ -1987,7 +1987,7 @@
@@ -2021,7 +2021,7 @@
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
@ -180,7 +180,7 @@
/**
* \def MBEDTLS_ARIA_C
@@ -2053,7 +2053,7 @@
@@ -2087,7 +2087,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
@ -189,7 +189,7 @@
/**
* \def MBEDTLS_CERTS_C
@@ -2065,7 +2065,7 @@
@@ -2099,7 +2099,7 @@
*
* This module is used for testing (ssl_client/server).
*/
@ -198,7 +198,7 @@
/**
* \def MBEDTLS_CHACHA20_C
@@ -2074,7 +2074,7 @@
@@ -2108,7 +2108,7 @@
*
* Module: library/chacha20.c
*/
@ -207,7 +207,7 @@
/**
* \def MBEDTLS_CHACHAPOLY_C
@@ -2085,7 +2085,7 @@
@@ -2119,7 +2119,7 @@
*
* This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
*/
@ -216,7 +216,7 @@
/**
* \def MBEDTLS_CIPHER_C
@@ -2140,7 +2140,7 @@
@@ -2174,7 +2174,7 @@
*
* This module provides debugging functions.
*/
@ -225,7 +225,7 @@
/**
* \def MBEDTLS_DES_C
@@ -2169,7 +2169,7 @@
@@ -2203,7 +2203,7 @@
* \warning DES is considered a weak cipher and its use constitutes a
* security risk. We recommend considering stronger ciphers instead.
*/
@ -234,7 +234,7 @@
/**
* \def MBEDTLS_DHM_C
@@ -2332,7 +2332,7 @@
@@ -2366,7 +2366,7 @@
* This module adds support for the Hashed Message Authentication Code
* (HMAC)-based key derivation function (HKDF).
*/
@ -243,7 +243,7 @@
/**
* \def MBEDTLS_HMAC_DRBG_C
@@ -2346,7 +2346,7 @@
@@ -2380,7 +2380,7 @@
*
* Uncomment to enable the HMAC_DRBG random number geerator.
*/
@ -252,7 +252,7 @@
/**
* \def MBEDTLS_NIST_KW_C
@@ -2642,7 +2642,7 @@
@@ -2676,7 +2676,7 @@
*
* This module enables abstraction of common (libc) functions.
*/
@ -261,7 +261,7 @@
/**
* \def MBEDTLS_POLY1305_C
@@ -2652,7 +2652,7 @@
@@ -2686,7 +2686,7 @@
* Module: library/poly1305.c
* Caller: library/chachapoly.c
*/
@ -270,7 +270,7 @@
/**
* \def MBEDTLS_RIPEMD160_C
@@ -2663,7 +2663,7 @@
@@ -2697,7 +2697,7 @@
* Caller: library/md.c
*
*/
@ -279,7 +279,7 @@
/**
* \def MBEDTLS_RSA_C
@@ -2770,7 +2770,7 @@
@@ -2804,7 +2804,7 @@
*
* Requires: MBEDTLS_CIPHER_C
*/
@ -288,7 +288,7 @@
/**
* \def MBEDTLS_SSL_CLI_C
@@ -2870,7 +2870,7 @@
@@ -2904,7 +2904,7 @@
*
* This module provides run-time version information.
*/
@ -297,7 +297,7 @@
/**
* \def MBEDTLS_X509_USE_C
@@ -2980,7 +2980,7 @@
@@ -3014,7 +3014,7 @@
* Module: library/xtea.c
* Caller:
*/

27
package/libs/mbedtls/patches/300-bn_mul.h-Use-optimized-MULADDC-code-only-on-ARM-6.patch
View File

@ -1,27 +0,0 @@
From 7aff5a70f3580426865b6c86437a3e47546d13f7 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 16 Dec 2018 13:02:49 +0100
Subject: [PATCH] bn_mul.h: Use optimized MULADDC code only on ARM >= 6
The optimized code uses umaal which was only introduced with ARMv6 and
is not available on older versions.
This broke compilation with arm926ej-s CPU for me.
Fixes: 16b1bd89326 ("bn_mul.h: add ARM DSP optimized MULADDC code")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
include/mbedtls/bn_mul.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/include/mbedtls/bn_mul.h
+++ b/include/mbedtls/bn_mul.h
@@ -644,7 +644,8 @@
"r6", "r7", "r8", "r9", "cc" \
);
-#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
+#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) && \
+ __TARGET_ARCH_ARM >= 6
#define MULADDC_INIT \
asm(

6
package/libs/mbedtls/patches/300-soversion-compatibility.patch
View File

@ -4,7 +4,7 @@
if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedcrypto SHARED ${src_crypto})
- set_target_properties(mbedcrypto PROPERTIES VERSION 2.16.2 SOVERSION 3)
- set_target_properties(mbedcrypto PROPERTIES VERSION 2.16.3 SOVERSION 3)
+ set_target_properties(mbedcrypto PROPERTIES VERSION 2.12.0 SOVERSION 1)
target_link_libraries(mbedcrypto ${libs})
@ -13,7 +13,7 @@
target_link_libraries(mbedx509 ${libs} mbedcrypto)
add_library(mbedtls SHARED ${src_tls})
- set_target_properties(mbedtls PROPERTIES VERSION 2.16.2 SOVERSION 12)
- set_target_properties(mbedtls PROPERTIES VERSION 2.16.3 SOVERSION 12)
+ set_target_properties(mbedtls PROPERTIES VERSION 2.12.0 SOVERSION 10)
target_link_libraries(mbedtls ${libs} mbedx509)
@ -30,5 +30,5 @@
-SOEXT_CRYPTO=so.3
+SOEXT_CRYPTO=so.1
# Set AR_DASH= (empty string) to use an ar implentation that does not accept
# Set AR_DASH= (empty string) to use an ar implementation that does not accept
# the - prefix for command line options (e.g. llvm-ar)