diff options
Diffstat (limited to 'package/mbedtls')
| -rw-r--r-- | package/mbedtls/0001-dhm-Fix-typo-in-RFC-5114-constants.patch | 33 | ||||
| -rw-r--r-- | package/mbedtls/mbedtls.hash | 6 | ||||
| -rw-r--r-- | package/mbedtls/mbedtls.mk | 2 |
3 files changed, 37 insertions, 4 deletions
diff --git a/package/mbedtls/0001-dhm-Fix-typo-in-RFC-5114-constants.patch b/package/mbedtls/0001-dhm-Fix-typo-in-RFC-5114-constants.patch new file mode 100644 index 0000000000..effaf3d931 --- /dev/null +++ b/package/mbedtls/0001-dhm-Fix-typo-in-RFC-5114-constants.patch @@ -0,0 +1,33 @@ +From 129f50838bf14f4e1319f06f41c827fae9cc4b73 Mon Sep 17 00:00:00 2001 +From: Jaeden Amero <jaeden.amero@arm.com> +Date: Thu, 8 Feb 2018 14:25:36 +0000 +Subject: [PATCH] dhm: Fix typo in RFC 5114 constants + +We accidentally named the constant MBEDTLS_DHM_RFC5114_MODP_P instead of +MBEDTLS_DHM_RFC5114_MODP_2048_P. + +Fixes #1358 + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Patch status: upstream commit 129f50838bf + + include/mbedtls/dhm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/mbedtls/dhm.h b/include/mbedtls/dhm.h +index da2e66b111b6..00fafd8d16f4 100644 +--- a/include/mbedtls/dhm.h ++++ b/include/mbedtls/dhm.h +@@ -372,7 +372,7 @@ MBEDTLS_DEPRECATED typedef char const * mbedtls_deprecated_constant_t; + * in <em>RFC-5114: Additional Diffie-Hellman Groups for Use with + * IETF Standards</em>. + */ +-#define MBEDTLS_DHM_RFC5114_MODP_P \ ++#define MBEDTLS_DHM_RFC5114_MODP_2048_P \ + MBEDTLS_DEPRECATED_STRING_CONSTANT( \ + "AD107E1E9123A9D0D660FAA79559C51FA20D64E5683B9FD1" \ + "B54B1597B61D0A75E6FA141DF95A56DBAF9A3C407BA1DF15" \ +-- +2.16.1 + diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index d04b867754..a62c0f58de 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,5 +1,5 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.6.0-2.1.9-and-1.3.21-released -sha1 e914288da50977f541773f9d36e26f14926594a5 mbedtls-2.6.0-apache.tgz -sha256 99bc9d4212d3d885eeb96273bcde8ecc649a481404b8d7ea7bb26397c9909687 mbedtls-2.6.0-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.7.0-2.1.10-and-1.3.22-released +sha1 01ffebf679c8696cc941c41224fa73d8944d2c85 mbedtls-2.7.0-apache.tgz +sha256 aeb66d6cd43aa1c79c145d15845c655627a7fc30d624148aaafbb6c36d7f55ef mbedtls-2.7.0-apache.tgz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 64ce18cf6f..7c26ea95ee 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.6.0 +MBEDTLS_VERSION = 2.7.0 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ |
