diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-14 11:30:51 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-14 11:30:51 +0000 |
| commit | a6311f856b9ed7d71460872148a735335338918e (patch) | |
| tree | ce18fd7f9d824d022f8eac0a43ec6b0bcddc08fe /crypto | |
| parent | ac892b7aa6532e0345e430208335403ead5d2de1 (diff) | |
| download | openssl-a6311f856b9ed7d71460872148a735335338918e.tar.gz | |
Remove several of the old obsolete FIPS_corrupt_*() functions.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/dsa/dsa_key.c | 9 | ||||
| -rw-r--r-- | crypto/ec/ec_key.c | 9 | ||||
| -rw-r--r-- | crypto/rsa/rsa_gen.c | 10 |
3 files changed, 0 insertions, 28 deletions
diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c index 39cf6b790d..c7589873a4 100644 --- a/crypto/dsa/dsa_key.c +++ b/crypto/dsa/dsa_key.c @@ -71,13 +71,6 @@ #include <openssl/fips.h> #include <openssl/evp.h> -static int fips_dsa_pairwise_fail = 0; - -void FIPS_corrupt_dsa_keygen(void) - { - fips_dsa_pairwise_fail = 1; - } - static int fips_check_dsa(DSA *dsa) { EVP_PKEY pk; @@ -159,8 +152,6 @@ static int dsa_builtin_keygen(DSA *dsa) dsa->priv_key=priv_key; dsa->pub_key=pub_key; #ifdef OPENSSL_FIPS - if (fips_dsa_pairwise_fail) - BN_add_word(dsa->pub_key, 1); if(!fips_check_dsa(dsa)) { dsa->pub_key = NULL; diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c index 1f048948e2..59bc08494e 100644 --- a/crypto/ec/ec_key.c +++ b/crypto/ec/ec_key.c @@ -236,13 +236,6 @@ int EC_KEY_up_ref(EC_KEY *r) #include <openssl/evp.h> -static int fips_ec_pairwise_fail = 0; - -void FIPS_corrupt_ec_keygen(void) - { - fips_ec_pairwise_fail = 1; - } - static int fips_check_ec(EC_KEY *key) { EVP_PKEY pk; @@ -311,8 +304,6 @@ int EC_KEY_generate_key(EC_KEY *eckey) eckey->pub_key = pub_key; #ifdef OPENSSL_FIPS - if (fips_ec_pairwise_fail) - BN_add_word(eckey->priv_key, 1); if(!fips_check_ec(eckey)) { eckey->priv_key = NULL; diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c index 977e461ef0..8f798c0dec 100644 --- a/crypto/rsa/rsa_gen.c +++ b/crypto/rsa/rsa_gen.c @@ -76,13 +76,6 @@ #include <openssl/fips.h> #include <openssl/evp.h> -static int fips_rsa_pairwise_fail = 0; - -void FIPS_corrupt_rsa_keygen(void) - { - fips_rsa_pairwise_fail = 1; - } - int fips_check_rsa(RSA *rsa) { const unsigned char tbs[] = "RSA Pairwise Check Data"; @@ -290,9 +283,6 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb) if (!BN_mod_inverse(rsa->iqmp,rsa->q,p,ctx)) goto err; #ifdef OPENSSL_FIPS - if (fips_rsa_pairwise_fail) - BN_add_word(rsa->n, 1); - if(!fips_check_rsa(rsa)) goto err; #endif |