aboutsummaryrefslogtreecommitdiffstats
path: root/community
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2018-06-11 14:20:36 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2018-06-11 14:20:36 +0000
commit44a52d56ef47740226463f2fba905f0ccfee8b03 (patch)
tree2639f76035ce4c5beba357f7f48b849daa2de332 /community
parent853d5a0a8046611764fc9d4c9d8dd6c0b0a9469b (diff)
downloadaports-44a52d56ef47740226463f2fba905f0ccfee8b03.tar.bz2
aports-44a52d56ef47740226463f2fba905f0ccfee8b03.tar.xz
community/mbedtls: security upgrade to 2.7.0
Diffstat (limited to 'community')
-rw-r--r--community/mbedtls/APKBUILD17
-rw-r--r--community/mbedtls/dhm-Fix-typo-in-RFC-5114-constants.patch26
2 files changed, 37 insertions, 6 deletions
diff --git a/community/mbedtls/APKBUILD b/community/mbedtls/APKBUILD
index 42270fc201..baf9936f12 100644
--- a/community/mbedtls/APKBUILD
+++ b/community/mbedtls/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mbedtls
-pkgver=2.6.1
+pkgver=2.7.0
pkgrel=0
pkgdesc="Light-weight cryptographic and SSL/TLS library"
url="https://tls.mbed.org/"
@@ -10,14 +10,19 @@ license="GPL-2.0-or-later Apache-2.0"
makedepends="cmake perl"
subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
source="$pkgname-$pkgver.tar.gz::https://github.com/ARMmbed/$pkgname/archive/$pkgname-$pkgver.tar.gz
- verbose-testsuite.patch"
+ dhm-Fix-typo-in-RFC-5114-constants.patch
+ "
builddir="$srcdir/$pkgname-$pkgname-$pkgver"
# secfixes:
# 2.4.2-r0:
-# - CVE-2017-2784
+# - CVE-2017-2784
# 2.6.0-r0:
-# - CVE-2017-14032
+# - CVE-2017-14032
+# 2.7.0-r0:
+# - CVE-2017-18187
+# - CVE-2018-0487
+# - CVE-2018-0488
prepare() {
default_prepare
@@ -65,5 +70,5 @@ static() {
chmod -x "$subpkgdir"/usr/lib/*.a
}
-sha512sums="06f8ba2a453164bac01d20ca6f5c80e691857977ef501d56685e81a0e90dddae1bedeab46c18c22f9a3b72894d45d7466f76a5c404417b6613ddae0ee4a881c8 mbedtls-2.6.1.tar.gz
-1a0f0c8c794f8aab2a050b660e86f3cba293fcd4d0ffba9a1a1b8fd88f631d68fe194256495ed584d13e577c577829f0bbe821ffaf11165163b5a78c9d68efe8 verbose-testsuite.patch"
+sha512sums="411ec25d2cd51abbbfa2312195c4e65aa578855f6f909b8668375e6f5ce5401a00153cb4790328daaf85cd2d0ce647dbcc9fa556331e2d14709ba64aff883867 mbedtls-2.7.0.tar.gz
+cc8c012a32a97f3c516d84c17df1911628178ffce7c6efc829258a7bad10951949c04ab770d88883a84a566fbe40de1cd60bfdfa986be813f5dbe883b601b042 dhm-Fix-typo-in-RFC-5114-constants.patch"
diff --git a/community/mbedtls/dhm-Fix-typo-in-RFC-5114-constants.patch b/community/mbedtls/dhm-Fix-typo-in-RFC-5114-constants.patch
new file mode 100644
index 0000000000..be994df9f1
--- /dev/null
+++ b/community/mbedtls/dhm-Fix-typo-in-RFC-5114-constants.patch
@@ -0,0 +1,26 @@
+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
+---
+ 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 da2e66b111..00fafd8d16 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" \