1 files changed, 1 insertions, 92 deletions

diff --git a/src/lib/libssl/src/fips/rsa/fips_rsa_gen.c b/src/lib/libcrypto/rsa/rsa_gen.c
index 90aaa2f095..767f7ab682 100644
--- a/src/lib/libssl/src/fips/rsa/fips_rsa_gen.c
+++ b/src/lib/libcrypto/rsa/rsa_gen.c
@@ -64,81 +64,9 @@
 
 #include <stdio.h>
 #include <time.h>
-#include <string.h>
-#include <openssl/crypto.h>
+#include "cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/fips.h>
-#include "fips_locl.h"
-
-#ifdef OPENSSL_FIPS
-
-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";
-        unsigned char *ctbuf = NULL, *ptbuf = NULL;
-        int len, ret = 0;
-        EVP_PKEY pk;
-        pk.type = EVP_PKEY_RSA;
-        pk.pkey.rsa = rsa;
-
-        /* Perform pairwise consistency signature test */
-        if (!fips_pkey_signature_test(&pk, tbs, -1,
-                        NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PKCS1, NULL)
-                || !fips_pkey_signature_test(&pk, tbs, -1,
-                        NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_X931, NULL)
-                || !fips_pkey_signature_test(&pk, tbs, -1,
-                        NULL, 0, EVP_sha1(), EVP_MD_CTX_FLAG_PAD_PSS, NULL))
-                goto err;
-        /* Now perform pairwise consistency encrypt/decrypt test */
-        ctbuf = OPENSSL_malloc(RSA_size(rsa));
-        if (!ctbuf)
-                goto err;
-
-        len = RSA_public_encrypt(sizeof(tbs) - 1, tbs, ctbuf, rsa, RSA_PKCS1_PADDING);
-        if (len <= 0)
-                goto err;
-        /* Check ciphertext doesn't match plaintext */
-        if ((len == (sizeof(tbs) - 1)) && !memcmp(tbs, ctbuf, len))
-                goto err;
-        ptbuf = OPENSSL_malloc(RSA_size(rsa));
-
-        if (!ptbuf)
-                goto err;
-        len = RSA_private_decrypt(len, ctbuf, ptbuf, rsa, RSA_PKCS1_PADDING);
-        if (len != (sizeof(tbs) - 1))
-                goto err;
-        if (memcmp(ptbuf, tbs, len))
-                goto err;
-
-        ret = 1;
-
-        if (!ptbuf)
-                goto err;
-        
-        err:
-        if (ret == 0)
-                {
-                fips_set_selftest_fail();
-                FIPSerr(FIPS_F_FIPS_CHECK_RSA,FIPS_R_PAIRWISE_TEST_FAILED);
-                }
-
-        if (ctbuf)
-                OPENSSL_free(ctbuf);
-        if (ptbuf)
-                OPENSSL_free(ptbuf);
-
-        return ret;
-        }
 
 static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb);
 
@@ -162,18 +90,6 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb)
         int bitsp,bitsq,ok= -1,n=0;
         BN_CTX *ctx=NULL;
 
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_RSA_BUILTIN_KEYGEN,FIPS_R_FIPS_SELFTEST_FAILED);
-            return 0;
-            }
-
-        if (FIPS_mode() && (bits < OPENSSL_RSA_FIPS_MIN_MODULUS_BITS))
-            {
-            FIPSerr(FIPS_F_RSA_BUILTIN_KEYGEN,FIPS_R_KEY_TOO_SHORT);
-            return 0;
-            }
-
         ctx=BN_CTX_new();
         if (ctx == NULL) goto err;
         BN_CTX_start(ctx);
@@ -285,12 +201,6 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb)
                 p = rsa->p;
         if (!BN_mod_inverse(rsa->iqmp,rsa->q,p,ctx)) goto err;
 
-        if (fips_rsa_pairwise_fail)
-                BN_add_word(rsa->n, 1);
-
-        if(!fips_check_rsa(rsa))
-            goto err;
-
         ok=1;
 err:
         if (ok == -1)
@@ -307,4 +217,3 @@ err:
         return ok;
         }
 
-#endif