[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  387e5ac856454e81d82a4b83388994fecbfc229e (commit)
      from  f55ef97b5c0f8559f393b72ebd4b2de32ad6d231 (commit)


- Log -----------------------------------------------------------------
commit 387e5ac856454e81d82a4b83388994fecbfc229e
Author: Todd Short <tshort at akamai.com>
Date:   Wed Jun 6 17:28:13 2018 -0400

    Add support for RSA-PSS to X509_certificate_type()
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6430)

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509type.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 3374e3e..0e33b42 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;