summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2019-11-01 15:08:37 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2019-11-01 15:08:37 +0000
commit19db77ffe922cda4f79269434f344013ae0f6329 (patch)
tree0eb15255cf2b6939ff6d70ea92836703cbaa0f28
parentafbd0a5878817d979d2039bfbeae43022c42707a (diff)
Wire up ASN.1 methods for RSA-PSS.
ok tb@
-rw-r--r--lib/libcrypto/asn1/ameth_lib.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libcrypto/asn1/ameth_lib.c b/lib/libcrypto/asn1/ameth_lib.c
index 505e986970c..212b86c5f74 100644
--- a/lib/libcrypto/asn1/ameth_lib.c
+++ b/lib/libcrypto/asn1/ameth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ameth_lib.c,v 1.19 2018/08/24 20:22:15 tb Exp $ */
+/* $OpenBSD: ameth_lib.c,v 1.20 2019/11/01 15:08:36 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@@ -71,6 +71,7 @@
#include "asn1_locl.h"
extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[];
+extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[];
extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
@@ -108,6 +109,9 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
&gostr01_asn1_meths[1],
&gostr01_asn1_meths[2],
#endif
+#ifndef OPENSSL_NO_RSA
+ &rsa_pss_asn1_meth,
+#endif
};
typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);