aboutsummaryrefslogtreecommitdiffstats
path: root/main/openssl1.0
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-07-18 10:14:56 +0300
committerTimo Teräs <timo.teras@iki.fi>2018-07-18 10:17:11 +0300
commitcd2b71132497073860182fd70dcc51c041193933 (patch)
treec9ae5baacb3eec6cf83a2a985795b51a6688db2b /main/openssl1.0
parente110f59bb83fd6b53b51c00289f28d00ce01bfdc (diff)
downloadaports-cd2b71132497073860182fd70dcc51c041193933.tar.bz2
aports-cd2b71132497073860182fd70dcc51c041193933.tar.xz
main/openssl1.0: cherry-pick fix for CVE-2018-0737
ref #8812
Diffstat (limited to 'main/openssl1.0')
-rw-r--r--main/openssl1.0/APKBUILD8
-rw-r--r--main/openssl1.0/CVE-2018-0737.patch28
2 files changed, 34 insertions, 2 deletions
diff --git a/main/openssl1.0/APKBUILD b/main/openssl1.0/APKBUILD
index e4ebbe635d..c135656db4 100644
--- a/main/openssl1.0/APKBUILD
+++ b/main/openssl1.0/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openssl1.0
_pkgname=openssl
pkgver=1.0.2o
-pkgrel=2
+pkgrel=3
pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
url="https://www.openssl.org"
arch="all"
@@ -27,6 +27,7 @@ source="http://www.openssl.org/source/$_pkgname-$pkgver.tar.gz
1002-backport-changes-from-upstream-padlock-module.patch
1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
CVE-2018-0732.patch
+ CVE-2018-0737.patch
"
builddir="$srcdir/$_pkgname-$pkgver"
@@ -65,6 +66,8 @@ builddir="$srcdir/$_pkgname-$pkgver"
# - CVE-2018-0739
# 1.0.2o-r1:
# - CVE-2018-0732
+# 1.0.2o-r3:
+# - CVE-2018-0737
build() {
local _target _optflags
@@ -153,4 +156,5 @@ c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723e
8c181760d7a149aa18d246d50f1c0438ffb63c98677b05306dfc00400ad0429b47d31e7c8d85126005c67f743d23e7a8a81174ffe98556f4caf9cf6b04d9ff17 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
a3555440b5f544bfd6b9ad97557d8f4c1d673f6a35219f65056a72035d186be5f354717ddf9784899b602464d48657b090ade24379552d43af97609c0f48c389 1002-backport-changes-from-upstream-padlock-module.patch
6353c7a94016c20db5d683dde37775f6780952ecdb1a5f39f878d04ba37f6ad79ae10fb6d65d181d912505a5d1e22463004cd855d548b364c00b120da2b0fdbc 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
-ff91298629f157496a012da00ba7325923f5d087bfa54b60e205bf2dfb06374e958912e0df39dbdf39773555455c1a3afa3dcde1ddfec6e85cf89b0b62cc0eb4 CVE-2018-0732.patch"
+ff91298629f157496a012da00ba7325923f5d087bfa54b60e205bf2dfb06374e958912e0df39dbdf39773555455c1a3afa3dcde1ddfec6e85cf89b0b62cc0eb4 CVE-2018-0732.patch
+70be7fb9abad901fd84e8028e328c5b2fb7feff18547cfb749c5f59faf06eceab9052f9979d721670f6f3e099ba59761e8394e986565d349dd25e9718eaa99f0 CVE-2018-0737.patch"
diff --git a/main/openssl1.0/CVE-2018-0737.patch b/main/openssl1.0/CVE-2018-0737.patch
new file mode 100644
index 0000000000..162dc3d7fa
--- /dev/null
+++ b/main/openssl1.0/CVE-2018-0737.patch
@@ -0,0 +1,28 @@
+From 349a41da1ad88ad87825414752a8ff5fdd6a6c3f Mon Sep 17 00:00:00 2001
+From: Billy Brumley <bbrumley@gmail.com>
+Date: Wed, 11 Apr 2018 10:10:58 +0300
+Subject: [PATCH] RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont
+ both get called with BN_FLG_CONSTTIME flag set.
+
+CVE-2018-0737
+
+Reviewed-by: Rich Salz <rsalz@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(cherry picked from commit 6939eab03a6e23d2bd2c3f5e34fe1d48e542e787)
+---
+ crypto/rsa/rsa_gen.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
+index 9ca5dfefb70..42b89a8dfaa 100644
+--- a/crypto/rsa/rsa_gen.c
++++ b/crypto/rsa/rsa_gen.c
+@@ -156,6 +156,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
+ if (BN_copy(rsa->e, e_value) == NULL)
+ goto err;
+
++ BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
++ BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
+ BN_set_flags(r2, BN_FLG_CONSTTIME);
+ /* generate p and q */
+ for (;;) {