[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[Matt Caswell]

The branch OpenSSL_1_1_1-stable has been updated
       via  5970d48093ecf5bc62b398c97e6ed030620dee30 (commit)
      from  49fabf6b4d3b53f0f1871be10c5b28e15e7d33d3 (commit)


- Log -----------------------------------------------------------------
commit 5970d48093ecf5bc62b398c97e6ed030620dee30
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Nov 7 22:07:22 2018 +0100

    rsa/rsa_ossl.c: cache MONT_CTX for public modulus earlier.
    
    Blinding is performed more efficiently and securely if MONT_CTX for public
    modulus is available by the time blinding parameter are instantiated. So
    make sure it's the case.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7586)
    
    (cherry picked from commit 2cc3f68cde77af23c61fbad65470602ee86f2575)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rsa/rsa_ossl.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c
index 2b1b006..09762b7 100644
--- a/crypto/rsa/rsa_ossl.c
+++ b/crypto/rsa/rsa_ossl.c
@@ -286,6 +286,11 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
         goto err;
     }
 
+    if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
+        if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
+                                    rsa->n, ctx))
+            goto err;
+
     if (!(rsa->flags & RSA_FLAG_NO_BLINDING)) {
         blinding = rsa_get_blinding(rsa, &local_blinding, ctx);
         if (blinding == NULL) {
@@ -318,13 +323,6 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
         }
         BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
 
-        if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
-            if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
-                                        rsa->n, ctx)) {
-                BN_free(d);
-                goto err;
-            }
-
         if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n, ctx,
                                    rsa->_method_mod_n)) {
             BN_free(d);