From 2149e02975d63e66f5160838067ab96408d6d869 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 1 Feb 2020 02:14:26 +0800 Subject: [PATCH] polarssl: bump to v2.16.4 --- package/lean/polarssl/Makefile | 4 +- .../polarssl/patches/100-disable_sslv3.patch | 12 - .../polarssl/patches/200-reduce_config.patch | 252 ------------------ 3 files changed, 2 insertions(+), 266 deletions(-) delete mode 100644 package/lean/polarssl/patches/100-disable_sslv3.patch delete mode 100644 package/lean/polarssl/patches/200-reduce_config.patch diff --git a/package/lean/polarssl/Makefile b/package/lean/polarssl/Makefile index 57fa81e91c..6c3c9c1672 100644 --- a/package/lean/polarssl/Makefile +++ b/package/lean/polarssl/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=polarssl SRC_PKG_NAME:=mbedtls -PKG_VERSION:=1.3.16 +PKG_VERSION:=2.16.4 PKG_RELEASE:=1 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(SRC_PKG_NAME)-$(PKG_VERSION)-gpl.tgz PKG_SOURCE_URL:=https://polarssl.org/download/ -PKG_MD5SUM:=66ebbbf67e8a9463041846822b0a1692 +PKG_HASH:=3441f32bda9c8ef58acc9e18028d09eb9c17d199eb27141bec074905152fb2fb PKG_BUILD_DIR:=$(BUILD_DIR)/$(SRC_PKG_NAME)-$(PKG_VERSION) diff --git a/package/lean/polarssl/patches/100-disable_sslv3.patch b/package/lean/polarssl/patches/100-disable_sslv3.patch deleted file mode 100644 index 56c6c4d235..0000000000 --- a/package/lean/polarssl/patches/100-disable_sslv3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/include/polarssl/config.h -+++ b/include/polarssl/config.h -@@ -1011,8 +1011,8 @@ - * POLARSSL_SHA1_C - * - * Comment this macro to disable support for SSL 3.0 -- */ - #define POLARSSL_SSL_PROTO_SSL3 -+ */ - - /** - * \def POLARSSL_SSL_PROTO_TLS1 diff --git a/package/lean/polarssl/patches/200-reduce_config.patch b/package/lean/polarssl/patches/200-reduce_config.patch deleted file mode 100644 index 6fef1a6f5c..0000000000 --- a/package/lean/polarssl/patches/200-reduce_config.patch +++ /dev/null @@ -1,252 +0,0 @@ ---- a/include/polarssl/config.h -+++ b/include/polarssl/config.h -@@ -432,8 +432,8 @@ - * Requires: POLARSSL_HMAC_DRBG_C - * - * Comment this macro to disable deterministic ECDSA. -- */ - #define POLARSSL_ECDSA_DETERMINISTIC -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED -@@ -454,8 +454,8 @@ - * TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 - * TLS_PSK_WITH_3DES_EDE_CBC_SHA - * TLS_PSK_WITH_RC4_128_SHA -- */ - #define POLARSSL_KEY_EXCHANGE_PSK_ENABLED -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED -@@ -478,8 +478,8 @@ - * TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 - * TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA - * TLS_DHE_PSK_WITH_RC4_128_SHA -- */ - #define POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED -@@ -498,8 +498,8 @@ - * TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 - * TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA - * TLS_ECDHE_PSK_WITH_RC4_128_SHA -- */ - #define POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED -@@ -523,8 +523,8 @@ - * TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 - * TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA - * TLS_RSA_PSK_WITH_RC4_128_SHA -- */ - #define POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED -@@ -602,8 +602,8 @@ - * TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 - * TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA - * TLS_ECDHE_RSA_WITH_RC4_128_SHA -- */ - #define POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED -@@ -626,8 +626,8 @@ - * TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 - * TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA - * TLS_ECDHE_ECDSA_WITH_RC4_128_SHA -- */ - #define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED -@@ -650,8 +650,8 @@ - * TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 - * TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 - * TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 -- */ - #define POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED -+ */ - - /** - * \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED -@@ -674,8 +674,8 @@ - * TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384 - * TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256 - * TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384 -- */ - #define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED -+ */ - - /** - * \def POLARSSL_PK_PARSE_EC_EXTENDED -@@ -835,8 +835,8 @@ - * \def POLARSSL_SELF_TEST - * - * Enable the checkup functions (*_self_test). -- */ - #define POLARSSL_SELF_TEST -+ */ - - /** - * \def POLARSSL_SSL_AEAD_RANDOM_IV -@@ -1151,8 +1151,8 @@ - * Requires: POLARSSL_VERSION_C - * - * Comment this to disable run-time checking and save ROM space -- */ - #define POLARSSL_VERSION_FEATURES -+ */ - - /** - * \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3 -@@ -1470,8 +1470,8 @@ - * TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384 - * TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 - * TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 -- */ - #define POLARSSL_CAMELLIA_C -+ */ - - /** - * \def POLARSSL_CCM_C -@@ -1498,8 +1498,8 @@ - * Requires: POLARSSL_PEM_PARSE_C - * - * This module is used for testing (ssl_client/server). -- */ - #define POLARSSL_CERTS_C -+ */ - - /** - * \def POLARSSL_CIPHER_C -@@ -1538,8 +1538,8 @@ - * library/ssl_tls.c - * - * This module provides debugging functions. -- */ - #define POLARSSL_DEBUG_C -+ */ - - /** - * \def POLARSSL_DES_C -@@ -1594,8 +1594,8 @@ - * ECDHE-ECDSA, ECDHE-RSA, DHE-PSK - * - * Requires: POLARSSL_ECP_C -- */ - #define POLARSSL_ECDH_C -+ */ - - /** - * \def POLARSSL_ECDSA_C -@@ -1609,8 +1609,8 @@ - * ECDHE-ECDSA - * - * Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C -- */ - #define POLARSSL_ECDSA_C -+ */ - - /** - * \def POLARSSL_ECP_C -@@ -1622,8 +1622,8 @@ - * library/ecdsa.c - * - * Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED -- */ - #define POLARSSL_ECP_C -+ */ - - /** - * \def POLARSSL_ENTROPY_C -@@ -1662,8 +1662,8 @@ - * - * This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other - * requisites are enabled as well. -- */ - #define POLARSSL_GCM_C -+ */ - - /** - * \def POLARSSL_HAVEGE_C -@@ -1699,8 +1699,8 @@ - * Requires: POLARSSL_MD_C - * - * Uncomment to enable the HMAC_DRBG random number geerator. -- */ - #define POLARSSL_HMAC_DRBG_C -+ */ - - /** - * \def POLARSSL_MD_C -@@ -1826,8 +1826,8 @@ - * Requires: POLARSSL_HAVE_ASM - * - * This modules adds support for the VIA PadLock on x86. -- */ - #define POLARSSL_PADLOCK_C -+ */ - - /** - * \def POLARSSL_PBKDF2_C -@@ -1992,8 +1992,8 @@ - * Module: library/ripemd160.c - * Caller: library/md.c - * -- */ - #define POLARSSL_RIPEMD160_C -+ */ - - /** - * \def POLARSSL_RSA_C -@@ -2072,8 +2072,8 @@ - * Caller: - * - * Requires: POLARSSL_SSL_CACHE_C -- */ - #define POLARSSL_SSL_CACHE_C -+ */ - - /** - * \def POLARSSL_SSL_CLI_C -@@ -2149,8 +2149,8 @@ - * Caller: library/havege.c - * - * This module is used by the HAVEGE random number generator. -- */ - #define POLARSSL_TIMING_C -+ */ - - /** - * \def POLARSSL_VERSION_C -@@ -2160,8 +2160,8 @@ - * Module: library/version.c - * - * This module provides run-time version information. -- */ - #define POLARSSL_VERSION_C -+ */ - - /** - * \def POLARSSL_X509_USE_C -@@ -2270,8 +2270,8 @@ - * - * Module: library/xtea.c - * Caller: -- */ - #define POLARSSL_XTEA_C -+ */ - - /* \} name SECTION: mbed TLS modules */ -