From: Tobias Nießen <tniessen@tnie.de>
Date: Fri, 18 Oct 2019 18:44:49 +0000 (+0200)
Subject: Allow EVP_PKEY_get0_RSA for RSA-PSS keys
X-Git-Tag: OpenSSL_1_1_1e~169
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4088b9263676748f5426cae1bcff132825a48d2a;p=oweals%2Fopenssl.git

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)
---

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;
     }