summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorTobias Nießen <tniessen@tnie.de>2019-10-18 20:44:49 +0200
committerMatt Caswell <matt@openssl.org>2019-10-28 11:11:34 +0000
commit4088b9263676748f5426cae1bcff132825a48d2a (patch)
tree027bc0e3d89d2ad48b7b83635227b320b75cdf89 /crypto/evp
parentc2183fdc1a9cd60bbfe8823822def0d09aa5ef3a (diff)
Allow EVP_PKEY_get0_RSA for RSA-PSS keys
RSA-PSS keys use the same internal structure as RSA keys but do not allow accessing it through EVP_PKEY_get0_RSA. This commit changes that behavior. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10217) (cherry picked from commit 465a58b117d5a85623f3998d6fbf2fe8712a5604)
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/p_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index e57fa9e289..72a23b4d5f 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -465,7 +465,7 @@ int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
{
- if (pkey->type != EVP_PKEY_RSA) {
+ if (pkey->type != EVP_PKEY_RSA && pkey->type != EVP_PKEY_RSA_PSS) {
EVPerr(EVP_F_EVP_PKEY_GET0_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
return NULL;
}