summaryrefslogtreecommitdiffstats
path: root/crypto/asn1
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-11-24 21:42:49 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-01-08 01:42:46 +0000
commit4e8ba7479df8c5fb23f59742f434ae0e78d1a42f (patch)
treea76837319e8a61532167f1dc0deda68496c95977 /crypto/asn1
parentffc6fad56287ef55eb42dc80de29713044717446 (diff)
PSS ASN.1 method
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2177)
Diffstat (limited to 'crypto/asn1')
-rw-r--r--crypto/asn1/standard_methods.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/asn1/standard_methods.h b/crypto/asn1/standard_methods.h
index 5b8f9dd447..51b0e81f68 100644
--- a/crypto/asn1/standard_methods.h
+++ b/crypto/asn1/standard_methods.h
@@ -30,6 +30,9 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
#ifndef OPENSSL_NO_CMAC
&cmac_asn1_meth,
#endif
+#ifndef OPENSSL_NO_RSA
+ &rsa_pss_asn1_meth,
+#endif
#ifndef OPENSSL_NO_DH
&dhx_asn1_meth,
#endif