Double free in i2o_ECPublicKey

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

diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c
index 91b91157983fe9e09025f7896314bec53c8dc82d..cc30e77132fafdf05cf49455c34087982965f9fc 100644 (file)
--- a/crypto/rsa/rsa_chk.c
+++ b/crypto/rsa/rsa_chk.c
@@ -53,12 +53,18 @@
 #include <openssl/rsa.h>
 
 
-int RSA_check_key(RSA *key)
+int RSA_check_key(const RSA *key)
        {
        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();
@@ -75,7 +81,7 @@ int RSA_check_key(RSA *key)
                }
        
        /* 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, NULL);
        if (r != 1)
                {
                ret = r;
@@ -85,7 +91,7 @@ int RSA_check_key(RSA *key)
                }
        
        /* 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, NULL);
        if (r != 1)
                {
                ret = r;