Import of old SSLeay release: SSLeay 0.9.1b (unreleased)

[openssl.git] / ssl / ssl_rsa.c

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 140475e5fbdeb83ca1dd07c2991637d30532c748..a8a62f1b04004b1ef87553cb93380930fde4b2b6 100644 (file)
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -229,6 +229,10 @@ EVP_PKEY *pkey;
 
        if (c->pkeys[i].x509 != NULL)
                {
+               EVP_PKEY_copy_parameters(
+                       X509_get_pubkey(c->pkeys[i].x509),pkey);
+               ERR_clear_error();
+
 #ifndef NO_RSA
                /* Don't check the public/private key, this is mostly
                 * for smart cards. */
@@ -503,6 +507,19 @@ X509 *x;
                }
 
        if (c->pkeys[i].privatekey != NULL)
+               {
+               EVP_PKEY_copy_parameters(pkey,c->pkeys[i].privatekey);
+               ERR_clear_error();
+
+#ifndef NO_RSA
+               /* Don't check the public/private key, this is mostly
+                * for smart cards. */
+               if ((c->pkeys[i].privatekey->type == EVP_PKEY_RSA) &&
+                       (RSA_flags(c->pkeys[i].privatekey->pkey.rsa) &
+                        RSA_METHOD_FLAG_NO_CHECK))
+                        ok=1;
+               else
+#endif
                {
                if (!X509_check_private_key(x,c->pkeys[i].privatekey))
                        {
@@ -527,6 +544,7 @@ X509 *x;
                        }
                else
                        ok=1;
+               } /* NO_RSA */
                }
        else
                ok=1;