aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Kroken <mkroken@gmail.com>2016-12-09 21:07:37 +0100
committerFelix Fietkau <nbd@nbd.name>2016-12-12 10:22:19 +0100
commit4b8c69258e5ff10178638f0503e59175e452a3df (patch)
tree1e641e18f548b15496f553478e33a0fd87a0674c
parent8f23ec609c671d3012e38151f4646b5f6ed578ce (diff)
downloadupstream-4b8c69258e5ff10178638f0503e59175e452a3df.tar.gz
upstream-4b8c69258e5ff10178638f0503e59175e452a3df.tar.bz2
upstream-4b8c69258e5ff10178638f0503e59175e452a3df.zip
mbedtls: enable MBEDTLS_DHM_C
This option is required by OpenVPN, and OpenVPN 2.4 uses mbedTLS 2.x. DHM_C is also already enabled in the PolarSSL 1.3.x config.h. Signed-off-by: Magnus Kroken <mkroken@gmail.com>
-rw-r--r--package/libs/mbedtls/Makefile2
-rw-r--r--package/libs/mbedtls/patches/200-config.patch9
2 files changed, 1 insertions, 10 deletions
diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 7b5096715d..c5bb3eee9b 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
PKG_VERSION:=2.4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch
index 8a3531f858..75d8342d3e 100644
--- a/package/libs/mbedtls/patches/200-config.patch
+++ b/package/libs/mbedtls/patches/200-config.patch
@@ -179,15 +179,6 @@
/**
* \def MBEDTLS_DES_C
-@@ -1740,7 +1740,7 @@
- * This module is used by the following key exchanges:
- * DHE-RSA, DHE-PSK
- */
--#define MBEDTLS_DHM_C
-+//#define MBEDTLS_DHM_C
-
- /**
- * \def MBEDTLS_ECDH_C
@@ -2158,7 +2158,7 @@
* Caller: library/mbedtls_md.c
*