From: Todd Short <tshort@akamai.com>
Date: Wed, 6 Jun 2018 21:28:13 +0000 (-0400)
Subject: Add support for RSA-PSS to X509_certificate_type()
X-Git-Tag: OpenSSL_1_1_1-pre8~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=387e5ac856454e81d82a4b83388994fecbfc229e;p=oweals%2Fopenssl.git

Add support for RSA-PSS to X509_certificate_type()

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6430)
---

diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 3374e3ea61..0e33b424be 100644
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -35,6 +35,9 @@ int X509_certificate_type(const X509 *x, const EVP_PKEY *pkey)
 /*              if (!sign only extension) */
         ret |= EVP_PKT_ENC;
         break;
+    case EVP_PKEY_RSA_PSS:
+        ret = EVP_PK_RSA | EVP_PKT_SIGN;
+        break;
     case EVP_PKEY_DSA:
         ret = EVP_PK_DSA | EVP_PKT_SIGN;
         break;