From 4088b9263676748f5426cae1bcff132825a48d2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Nie=C3=9Fen?= Date: Fri, 18 Oct 2019 20:44:49 +0200 Subject: [PATCH] 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 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10217) (cherry picked from commit 465a58b117d5a85623f3998d6fbf2fe8712a5604) --- crypto/evp/p_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.25.1