aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-16 00:19:47 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-16 00:19:47 +0000
commit6665bbb1a06227c111c04119a0f9a2d2afbeca28 (patch)
tree5ec5de05bc8278af9c65bf247c54982299e7f06c /package/libs
parenteaa4eba10a8978f6dce9c309e78aa154b15a296d (diff)
downloadupstream-6665bbb1a06227c111c04119a0f9a2d2afbeca28.tar.gz
upstream-6665bbb1a06227c111c04119a0f9a2d2afbeca28.tar.bz2
upstream-6665bbb1a06227c111c04119a0f9a2d2afbeca28.zip
mbedtls: update to version 2.2.1
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48254
Diffstat (limited to 'package/libs')
-rw-r--r--package/libs/mbedtls/Makefile4
-rw-r--r--package/libs/mbedtls/patches/200-config.patch34
2 files changed, 19 insertions, 19 deletions
diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 13dcc9829f..13299cf273 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.2.1
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://tls.mbed.org/download/
-PKG_MD5SUM:=20c45e0411e177e51498ef1be60bc7e2
+PKG_MD5SUM:=bb1bffa3ac5ab143be2aae3d45a7a92b36112888ef465024d83724865fe62974
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0+
diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch
index 1a9169ce31..a3e393e402 100644
--- a/package/libs/mbedtls/patches/200-config.patch
+++ b/package/libs/mbedtls/patches/200-config.patch
@@ -1,6 +1,6 @@
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
-@@ -184,7 +184,7 @@
+@@ -183,7 +183,7 @@
*
* Uncomment to get errors on using deprecated functions.
*/
@@ -9,7 +9,7 @@
/* \} name SECTION: System support */
-@@ -323,7 +323,7 @@
+@@ -322,7 +322,7 @@
*
* Enable Cipher Feedback mode (CFB) for symmetric ciphers.
*/
@@ -89,8 +89,8 @@
+//#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
/**
- * \def MBEDTLS_PK_PARSE_EC_EXTENDED
-@@ -813,7 +813,7 @@
+ * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+@@ -832,7 +832,7 @@
*
* Comment this macro to disable support for external private RSA keys.
*/
@@ -99,7 +99,7 @@
/**
* \def MBEDTLS_PKCS1_V15
-@@ -845,14 +845,14 @@
+@@ -864,14 +864,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
@@ -116,7 +116,7 @@
/**
* \def MBEDTLS_SHA256_SMALLER
-@@ -868,7 +868,7 @@
+@@ -887,7 +887,7 @@
*
* Uncomment to enable the smaller implementation of SHA256.
*/
@@ -125,7 +125,7 @@
/**
* \def MBEDTLS_SSL_AEAD_RANDOM_IV
-@@ -1041,7 +1041,7 @@
+@@ -1060,7 +1060,7 @@
*
* Comment this macro to disable support for SSL 3.0
*/
@@ -134,7 +134,7 @@
/**
* \def MBEDTLS_SSL_PROTO_TLS1
-@@ -1195,7 +1195,7 @@
+@@ -1224,7 +1224,7 @@
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
@@ -143,7 +143,7 @@
/**
* \def MBEDTLS_THREADING_ALT
-@@ -1431,7 +1431,7 @@
+@@ -1460,7 +1460,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
* MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
*/
@@ -152,7 +152,7 @@
/**
* \def MBEDTLS_ASN1_PARSE_C
-@@ -1496,7 +1496,7 @@
+@@ -1525,7 +1525,7 @@
*
* Module: library/blowfish.c
*/
@@ -161,7 +161,7 @@
/**
* \def MBEDTLS_CAMELLIA_C
-@@ -1551,7 +1551,7 @@
+@@ -1580,7 +1580,7 @@
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
@@ -170,7 +170,7 @@
/**
* \def MBEDTLS_CCM_C
-@@ -1565,7 +1565,7 @@
+@@ -1594,7 +1594,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
@@ -179,7 +179,7 @@
/**
* \def MBEDTLS_CERTS_C
-@@ -1577,7 +1577,7 @@
+@@ -1606,7 +1606,7 @@
*
* This module is used for testing (ssl_client/server).
*/
@@ -188,7 +188,7 @@
/**
* \def MBEDTLS_CIPHER_C
-@@ -1617,7 +1617,7 @@
+@@ -1646,7 +1646,7 @@
*
* This module provides debugging functions.
*/
@@ -197,7 +197,7 @@
/**
* \def MBEDTLS_DES_C
-@@ -1657,7 +1657,7 @@
+@@ -1686,7 +1686,7 @@
* This module is used by the following key exchanges:
* DHE-RSA, DHE-PSK
*/
@@ -206,7 +206,7 @@
/**
* \def MBEDTLS_ECDH_C
-@@ -2047,7 +2047,7 @@
+@@ -2096,7 +2096,7 @@
* Caller: library/mbedtls_md.c
*
*/
@@ -215,7 +215,7 @@
/**
* \def MBEDTLS_RSA_C
-@@ -2345,7 +2345,7 @@
+@@ -2394,7 +2394,7 @@
* Module: library/xtea.c
* Caller:
*/