summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2019-11-01 15:08:58 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2019-11-01 15:08:58 +0000
commita190cd5590758f242377676af4be800d356337ac (patch)
treee5a13deda477e86296ecbea7f0861b3f4aa35873
parent19db77ffe922cda4f79269434f344013ae0f6329 (diff)
Wire up PKEY methods for RSA-PSS.
ok tb@
-rw-r--r--lib/libcrypto/evp/pmeth_lib.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libcrypto/evp/pmeth_lib.c b/lib/libcrypto/evp/pmeth_lib.c
index ea9b8fed0cd..36bfe8d9fc8 100644
--- a/lib/libcrypto/evp/pmeth_lib.c
+++ b/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmeth_lib.c,v 1.15 2019/10/29 07:52:17 jsing Exp $ */
+/* $OpenBSD: pmeth_lib.c,v 1.16 2019/11/01 15:08:57 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@@ -78,7 +78,8 @@ typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
DECLARE_STACK_OF(EVP_PKEY_METHOD)
STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
-extern const EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth;
+extern const EVP_PKEY_METHOD rsa_pkey_meth, rsa_pss_pkey_meth;
+extern const EVP_PKEY_METHOD dh_pkey_meth, dsa_pkey_meth;
extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth, cmac_pkey_meth;
extern const EVP_PKEY_METHOD gostimit_pkey_meth, gostr01_pkey_meth;
@@ -101,6 +102,9 @@ static const EVP_PKEY_METHOD *standard_methods[] = {
#endif
&hmac_pkey_meth,
&cmac_pkey_meth,
+#ifndef OPENSSL_NO_RSA
+ &rsa_pss_pkey_meth,
+#endif
};
static int pmeth_cmp_BSEARCH_CMP_FN(const void *, const void *);