summaryrefslogtreecommitdiffstats
path: root/apps/s_cb.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-01-25 16:22:13 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-01-30 12:59:28 +0000
commitb2eb699874976d4ecc48b2180cba5d8301d844fa (patch)
treebd8c944b1891b56523713186ff005cecf895075f /apps/s_cb.c
parent98c792d18c067f45a0a04bf6e6b0ea6cae238804 (diff)
More complete PSS support.
Extend support for PSS key signatures by using the EVP_PKEY_RSA_PSS type to distinguish them from PKCS1 signature types. Allow setting of PSS signature algorithms using the string "PSS" or "RSA-PSS". Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2301)
Diffstat (limited to 'apps/s_cb.c')
-rw-r--r--apps/s_cb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c
index d5c308ee13..5026d904c7 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -243,6 +243,8 @@ static int do_print_sigalgs(BIO *out, SSL *s, int shared)
BIO_puts(out, ":");
if (sign_nid == EVP_PKEY_RSA)
sstr = "RSA";
+ else if (sign_nid == EVP_PKEY_RSA_PSS)
+ sstr = "RSA-PSS";
else if (sign_nid == EVP_PKEY_DSA)
sstr = "DSA";
else if (sign_nid == EVP_PKEY_EC)