diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-19 01:04:07 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-12-08 13:25:38 +0000 |
| commit | 8d73db288f9dfb2922820d66e5f33f611d4fa182 (patch) | |
| tree | b04736faf7c977ac9bb941f5cafafdcf9c0967a5 /crypto/rsa/rsa_x931g.c | |
| parent | 05417a3476365bc35aa3e206e15572f12a4145c5 (diff) | |
remove FIPS module code from crypto/rsa
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/rsa/rsa_x931g.c')
| -rw-r--r-- | crypto/rsa/rsa_x931g.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c index e6e62c4ad3..2f37cf4699 100644 --- a/crypto/rsa/rsa_x931g.c +++ b/crypto/rsa/rsa_x931g.c @@ -65,12 +65,6 @@ #include <openssl/bn.h> #include <openssl/rsa.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> - -extern int fips_check_rsa(RSA *rsa); -#endif - /* X9.31 RSA key derivation and generation */ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2, @@ -209,29 +203,6 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e, BN_GENCB *cb) BIGNUM *Xp = NULL, *Xq = NULL; BN_CTX *ctx = NULL; -#ifdef OPENSSL_FIPS - if (FIPS_module_mode() && !(rsa->flags & RSA_FLAG_NON_FIPS_ALLOW) && - (bits < OPENSSL_RSA_FIPS_MIN_MODULUS_BITS)) - { - FIPSerr(FIPS_F_RSA_X931_GENERATE_KEY_EX,FIPS_R_KEY_TOO_SHORT); - return 0; - } - - if (bits & 0xff) - { - FIPSerr(FIPS_F_RSA_X931_GENERATE_KEY_EX,FIPS_R_INVALID_KEY_LENGTH); - return 0; - } - - if(FIPS_selftest_failed()) - { - FIPSerr(FIPS_F_RSA_X931_GENERATE_KEY_EX,FIPS_R_FIPS_SELFTEST_FAILED); - return 0; - } - if (!fips_check_rsa_prng(rsa, bits)) - return 0; -#endif - ctx = BN_CTX_new(); if (!ctx) goto error; @@ -265,11 +236,6 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e, BN_GENCB *cb) NULL, NULL, NULL, NULL, NULL, NULL, e, cb)) goto error; -#ifdef OPENSSL_FIPS - if(!fips_check_rsa(rsa)) - goto error; -#endif - ok = 1; error: |