RT992: RSA_check_key should have a callback arg

[openssl.git] / crypto / rsa / rsa_chk.c

diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c
index 8e99fe019dd67e1d2bf131d4f7b7074990036437..a351e6dee4a98b223e3f081374bc9bd909ab44d0 100644 (file)
--- a/crypto/rsa/rsa_chk.c
+++ b/crypto/rsa/rsa_chk.c
@@ -53,12 +53,23 @@
 #include <openssl/rsa.h>
 
 
 #include <openssl/rsa.h>
 
 

-int RSA_check_key(RSA *key)
+int RSA_check_key(const RSA *key)
+       {
+       return RSA_check_key_ex(key, NULL);
+       }
+
+int RSA_check_key_ex(const RSA *key, BN_GENCB *cb)

        {
        BIGNUM *i, *j, *k, *l, *m;
        BN_CTX *ctx;
        int r;
        int ret=1;
        {
        BIGNUM *i, *j, *k, *l, *m;
        BN_CTX *ctx;
        int r;
        int ret=1;

+
+       if (!key->p || !key->q || !key->n || !key->e || !key->d)
+               {
+               RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_VALUE_MISSING);
+               return 0;
+               }

        
        i = BN_new();
        j = BN_new();
        
        i = BN_new();
        j = BN_new();


@@ -75,7 +86,7 @@ int RSA_check_key(RSA *key)
                }
        
        /* p prime? */
                }
        
        /* p prime? */

-       r = BN_is_prime(key->p, BN_prime_checks, NULL, NULL, NULL);
+       r = BN_is_prime_ex(key->p, BN_prime_checks, NULL, cb);

        if (r != 1)
                {
                ret = r;
        if (r != 1)
                {
                ret = r;


@@ -85,7 +96,7 @@ int RSA_check_key(RSA *key)
                }
        
        /* q prime? */
                }
        
        /* q prime? */

-       r = BN_is_prime(key->q, BN_prime_checks, NULL, NULL, NULL);
+       r = BN_is_prime_ex(key->q, BN_prime_checks, NULL, cb);

        if (r != 1)
                {
                ret = r;
        if (r != 1)
                {
                ret = r;


@@ -104,42 +115,6 @@ int RSA_check_key(RSA *key)
                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_N_DOES_NOT_EQUAL_P_Q);
                }
        
                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_N_DOES_NOT_EQUAL_P_Q);
                }
        

-       /* dmp1 = d mod (p-1)? */
-       r = BN_sub(i, key->p, BN_value_one());
-       if (!r) { ret = -1; goto err; }
-
-       r = BN_mod(j, key->d, i, ctx);
-       if (!r) { ret = -1; goto err; }
-
-       if (BN_cmp(j, key->dmp1) != 0)
-               {
-               ret = 0;
-               RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_DMP1_NOT_CONGRUENT_TO_D);
-               }
-       
-       /* dmq1 = d mod (q-1)? */    
-       r = BN_sub(i, key->q, BN_value_one());
-       if (!r) { ret = -1; goto err; }
-       
-       r = BN_mod(j, key->d, i, ctx);
-       if (!r) { ret = -1; goto err; }
-
-       if (BN_cmp(j, key->dmq1) != 0)
-               {
-               ret = 0;
-               RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_DMQ1_NOT_CONGRUENT_TO_D);
-               }
-       
-       /* iqmp = q^-1 mod p? */
-       r = BN_mod_inverse(i, key->q, key->p, ctx);
-       if (!r) { ret = -1; goto err; }
-
-       if (BN_cmp(i, key->iqmp) != 0)
-               {
-               ret = 0;
-               RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_IQMP_NOT_INVERSE_OF_Q);
-               }
-       

        /* d*e = 1  mod lcm(p-1,q-1)? */
 
        r = BN_sub(i, key->p, BN_value_one());
        /* d*e = 1  mod lcm(p-1,q-1)? */
 
        r = BN_sub(i, key->p, BN_value_one());


@@ -164,6 +139,51 @@ int RSA_check_key(RSA *key)
                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_D_E_NOT_CONGRUENT_TO_1);
                }
        
                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_D_E_NOT_CONGRUENT_TO_1);
                }
        

+       if (key->dmp1 != NULL && key->dmq1 != NULL && key->iqmp != NULL)
+               {
+               /* dmp1 = d mod (p-1)? */
+               r = BN_sub(i, key->p, BN_value_one());
+               if (!r) { ret = -1; goto err; }
+
+               r = BN_mod(j, key->d, i, ctx);
+               if (!r) { ret = -1; goto err; }
+
+               if (BN_cmp(j, key->dmp1) != 0)
+                       {
+                       ret = 0;
+                       RSAerr(RSA_F_RSA_CHECK_KEY,
+                               RSA_R_DMP1_NOT_CONGRUENT_TO_D);
+                       }
+       
+               /* dmq1 = d mod (q-1)? */    
+               r = BN_sub(i, key->q, BN_value_one());
+               if (!r) { ret = -1; goto err; }
+       
+               r = BN_mod(j, key->d, i, ctx);
+               if (!r) { ret = -1; goto err; }
+
+               if (BN_cmp(j, key->dmq1) != 0)
+                       {
+                       ret = 0;
+                       RSAerr(RSA_F_RSA_CHECK_KEY,
+                               RSA_R_DMQ1_NOT_CONGRUENT_TO_D);
+                       }
+       
+               /* iqmp = q^-1 mod p? */
+               if(!BN_mod_inverse(i, key->q, key->p, ctx))
+                       {
+                       ret = -1;
+                       goto err;
+                       }
+
+               if (BN_cmp(i, key->iqmp) != 0)
+                       {
+                       ret = 0;
+                       RSAerr(RSA_F_RSA_CHECK_KEY,
+                               RSA_R_IQMP_NOT_INVERSE_OF_Q);
+                       }
+               }
+

  err:
        if (i != NULL) BN_free(i);
        if (j != NULL) BN_free(j);
  err:
        if (i != NULL) BN_free(i);
        if (j != NULL) BN_free(j);