From: Billy Brumley <bbrumley@gmail.com>
Date: Wed, 11 Apr 2018 07:10:58 +0000 (+0300)
Subject: RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont both get called with... 
X-Git-Tag: OpenSSL_1_0_2p~87
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=349a41da1ad88ad87825414752a8ff5fdd6a6c3f;p=oweals%2Fopenssl.git

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)
---

diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index 9ca5dfefb7..42b89a8dfa 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 (;;) {