diff options
| author | Ralf S. Engelschall <rse@openssl.org> | 1998-12-21 12:00:56 +0100 |
|---|---|---|
| committer | Ralf S. Engelschall <rse@openssl.org> | 1998-12-21 12:00:56 +0100 |
| commit | dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c (patch) | |
| tree | 2f74e0cfd76a9e092548a9bf52e579aef984299b /ssl/ssl_rsa.c | |
| parent | Import of old SSLeay release: SSLeay 0.9.0b (diff) | |
| download | openssl-dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c.tar.xz openssl-dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c.zip | |
Import of old SSLeay release: SSLeay 0.9.1b (unreleased)
Diffstat (limited to 'ssl/ssl_rsa.c')
| -rw-r--r-- | ssl/ssl_rsa.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 140475e5fb..a8a62f1b04 100644 --- 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. */ @@ -504,6 +508,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)) { if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA)) @@ -527,6 +544,7 @@ X509 *x; } else ok=1; + } /* NO_RSA */ } else ok=1; |