diff options
| author | jsing <> | 2019-11-01 15:08:36 +0000 |
|---|---|---|
| committer | jsing <> | 2019-11-01 15:08:36 +0000 |
| commit | 98c2dc0c0d57c87ed8521348977e85f15b5e0027 (patch) | |
| tree | b302117efc4c551a1a6195dcfc09416b2281ebe5 /src | |
| parent | f0d1bafcb86f580a9dbc6e043c34322a3c3c8a09 (diff) | |
| download | openbsd-98c2dc0c0d57c87ed8521348977e85f15b5e0027.tar.gz openbsd-98c2dc0c0d57c87ed8521348977e85f15b5e0027.tar.bz2 openbsd-98c2dc0c0d57c87ed8521348977e85f15b5e0027.zip | |
Wire up ASN.1 methods for RSA-PSS.
ok tb@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/asn1/ameth_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c index 505e986970..212b86c5f7 100644 --- a/src/lib/libcrypto/asn1/ameth_lib.c +++ b/src/lib/libcrypto/asn1/ameth_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ameth_lib.c,v 1.19 2018/08/24 20:22:15 tb Exp $ */ | 1 | /* $OpenBSD: ameth_lib.c,v 1.20 2019/11/01 15:08:36 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 | */ |
| @@ -71,6 +71,7 @@ | |||
| 71 | #include "asn1_locl.h" | 71 | #include "asn1_locl.h" |
| 72 | 72 | ||
| 73 | extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[]; | 73 | extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[]; |
| 74 | extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth; | ||
| 74 | extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[]; | 75 | extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[]; |
| 75 | extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; | 76 | extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; |
| 76 | extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; | 77 | extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; |
| @@ -108,6 +109,9 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { | |||
| 108 | &gostr01_asn1_meths[1], | 109 | &gostr01_asn1_meths[1], |
| 109 | &gostr01_asn1_meths[2], | 110 | &gostr01_asn1_meths[2], |
| 110 | #endif | 111 | #endif |
| 112 | #ifndef OPENSSL_NO_RSA | ||
| 113 | &rsa_pss_asn1_meth, | ||
| 114 | #endif | ||
| 111 | }; | 115 | }; |
| 112 | 116 | ||
| 113 | typedef int sk_cmp_fn_type(const char * const *a, const char * const *b); | 117 | typedef int sk_cmp_fn_type(const char * const *a, const char * const *b); |
