Commit 5030cc69 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

use X9.31 keygen by default in FIPS mode 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit d0c9a906)
parent 721cbae7

crypto/rsa/rsa_gen.c

+3 −1
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ 
#include <openssl/rsa.h>

#ifdef OPENSSL_FIPS

# include <openssl/fips.h>

extern int FIPS_rsa_x931_generate_key_ex(RSA *rsa, int bits, BIGNUM *e,

                                         BN_GENCB *cb);

#endif



static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
@@ -94,7 +96,7 @@ int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb) 
        return rsa->meth->rsa_keygen(rsa, bits, e_value, cb);

#ifdef OPENSSL_FIPS

    if (FIPS_mode())

        return FIPS_rsa_generate_key_ex(rsa, bits, e_value, cb);

        return FIPS_rsa_x931_generate_key_ex(rsa, bits, e_value, cb);

#endif

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

}