summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2019-11-01 15:08:57 +0000
committerjsing <>2019-11-01 15:08:57 +0000
commit1cfe0047674d0c6b643658a72aee25b867fd2acc (patch)
treea8b863ab216a418401a84ca767f9419f4ee7986c
parentd84b51187b1bcafa63c05e404b3d9c51611f5ded (diff)
downloadopenbsd-1cfe0047674d0c6b643658a72aee25b867fd2acc.tar.gz
openbsd-1cfe0047674d0c6b643658a72aee25b867fd2acc.tar.bz2
openbsd-1cfe0047674d0c6b643658a72aee25b867fd2acc.zip
Wire up PKEY methods for RSA-PSS.
ok tb@
-rw-r--r--src/lib/libcrypto/evp/pmeth_lib.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index ea9b8fed0c..36bfe8d9fc 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_lib.c,v 1.15 2019/10/29 07:52:17 jsing Exp $ */ 1/* $OpenBSD: pmeth_lib.c,v 1.16 2019/11/01 15:08:57 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -78,7 +78,8 @@ typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
78DECLARE_STACK_OF(EVP_PKEY_METHOD) 78DECLARE_STACK_OF(EVP_PKEY_METHOD)
79STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL; 79STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
80 80
81extern const EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth; 81extern const EVP_PKEY_METHOD rsa_pkey_meth, rsa_pss_pkey_meth;
82extern const EVP_PKEY_METHOD dh_pkey_meth, dsa_pkey_meth;
82extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth, cmac_pkey_meth; 83extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth, cmac_pkey_meth;
83extern const EVP_PKEY_METHOD gostimit_pkey_meth, gostr01_pkey_meth; 84extern const EVP_PKEY_METHOD gostimit_pkey_meth, gostr01_pkey_meth;
84 85
@@ -101,6 +102,9 @@ static const EVP_PKEY_METHOD *standard_methods[] = {
101#endif 102#endif
102 &hmac_pkey_meth, 103 &hmac_pkey_meth,
103 &cmac_pkey_meth, 104 &cmac_pkey_meth,
105#ifndef OPENSSL_NO_RSA
106 &rsa_pss_pkey_meth,
107#endif
104}; 108};
105 109
106static int pmeth_cmp_BSEARCH_CMP_FN(const void *, const void *); 110static int pmeth_cmp_BSEARCH_CMP_FN(const void *, const void *);