Commit e44480cc authored by Andy Polyakov's avatar Andy Polyakov
Browse files

rsa/rsa_gen.c: ensure backward compatibility with external rsa->meth. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4770)
parent 88ac224c

crypto/rsa/rsa_gen.c

+14 −1
Original line number Diff line number Diff line
@@ -42,9 +42,22 @@ int RSA_generate_multi_prime_key(RSA *rsa, int bits, int primes, 
                                 BIGNUM *e_value, BN_GENCB *cb)

{

    /* multi-prime is only supported with the builtin key generation */

    if (rsa->meth->rsa_multi_prime_keygen != NULL)

    if (rsa->meth->rsa_multi_prime_keygen != NULL) {

        return rsa->meth->rsa_multi_prime_keygen(rsa, bits, primes,

                                                 e_value, cb);

    } else if (rsa->meth->rsa_keygen != NULL) {

        /*

         * However, if rsa->meth implements only rsa_keygen, then we

         * have to honour it in 2-prime case and assume that it wouldn't

         * know what to do with multi-prime key generated by builtin

         * subroutine...

         */

        if (primes == 2)

            return rsa->meth->rsa_keygen(rsa, bits, e_value, cb);

        else

            return 0;

    }



    return rsa_builtin_keygen(rsa, bits, primes, e_value, cb);

}