aboutsummaryrefslogtreecommitdiffstats
path: root/main/openssl/CVE-2018-0737.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-07-18 10:25:07 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2018-11-22 16:32:44 +0100
commit8318a0b07a3aac56659289654c3403dfb8ee5ae1 (patch)
tree7679e00431fc367ecc7fe9543b3b908791a97f59 /main/openssl/CVE-2018-0737.patch
parent83efaea263b7c03fff18c3cd4a08f46fe6d55ca0 (diff)
downloadaports-8318a0b07a3aac56659289654c3403dfb8ee5ae1.tar.gz
aports-8318a0b07a3aac56659289654c3403dfb8ee5ae1.tar.bz2
aports-8318a0b07a3aac56659289654c3403dfb8ee5ae1.tar.xz
main/openssl: fix CVE-2018-0732 and CVE-2018-0737
fixes #8814 fixes #9009
Diffstat (limited to 'main/openssl/CVE-2018-0737.patch')
-rw-r--r--main/openssl/CVE-2018-0737.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/main/openssl/CVE-2018-0737.patch b/main/openssl/CVE-2018-0737.patch
new file mode 100644
index 0000000000..162dc3d7fa
--- /dev/null
+++ b/main/openssl/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 (;;) {