Commit 23bfb5b5 authored by Andy Polyakov's avatar Andy Polyakov Committed by Dr. Matthias St. Pierre
Browse files

rsa/rsa_eay.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: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>

(manually cherry picked from commit 2cc3f68c)

(Merged from https://github.com/openssl/openssl/pull/7586)
parent 8bfde257

crypto/rsa/rsa_eay.c

+5 −5
Original line number Diff line number Diff line
@@ -397,6 +397,11 @@ static int RSA_eay_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, CRYPTO_LOCK_RSA,

                                    rsa->n, ctx))

            goto err;



    if (!(rsa->flags & RSA_FLAG_NO_BLINDING)) {

        blinding = rsa_get_blinding(rsa, &local_blinding, ctx);

        if (blinding == NULL) {
@@ -431,11 +436,6 @@ static int RSA_eay_private_encrypt(int flen, const unsigned char *from, 
        } else

            d = rsa->d;



        if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)

            if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, CRYPTO_LOCK_RSA,

                                        rsa->n, ctx))

                goto err;



        if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n, ctx,

                                   rsa->_method_mod_n))

            goto err;